Robin Gareus
2397429e99
use quotes for in-tree pbd/glib wrapper include
2015-10-05 22:15:18 +02:00
Robin Gareus
f27800ea41
use pbd's gstdio compatibility wrapper (GUI)
2015-09-17 14:38:09 +02:00
Robin Gareus
c90400364a
prepare saving video-export settings.
...
* migrate dialog from Editor to UI.
* make it a WM proxied window
* prepare applying state after construction..
2015-02-28 02:36:58 +01:00
Paul Davis
232cb73983
remove final reference to jack headers
2014-04-10 10:17:36 -04:00
Paul Davis
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
Paul Davis
84f55440a3
fix redrawing of canvas with an optimized build
...
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
2013-12-23 15:35:49 -05:00
Robin Gareus
dc7878760d
vtl: do not lock audio [to video] when extracting audio-only.
2013-12-23 10:28:32 +01:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
John Emmas
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
Robin Gareus
c2b2953f8c
export video-range: add to context menu
2013-10-12 22:56:08 +02:00
John Emmas
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
Paul Davis
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
Paul Davis
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
Robin Gareus
8432f78346
vtl: export selected range
2013-09-12 22:46:11 +02:00
Paul Davis
c222acecaa
fix #5609 (import with 1 track per channel mis-associates tracks + channels)
...
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.
2013-08-08 15:24:15 -04:00
Paul Davis
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
Paul Davis
d5209cb4bf
fix #5609 (import with 1 track per channel mis-associates tracks + channels)
...
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.
2013-07-23 11:29:10 -04:00
Paul Davis
15be154515
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
2013-07-15 14:29:00 -04:00
Paul Davis
3031a99364
Merge branch 'master' into cairocanvas
2013-06-25 22:24:47 -04:00
Robin Gareus
e6e5aab812
move video export info to online-manual, allow to open it.
2013-06-19 20:26:53 +02:00
Robin Gareus
74f2472c7d
vtl: more frame->sample renames and cleaning
2013-04-17 09:10:47 +02:00
Robin Gareus
5cac4a6885
vtl: get rid of unused "bar" inside the ruler
2013-04-17 02:27:17 +02:00
Paul Davis
caaa70a810
remove commented out popup about video export success
2013-04-16 14:03:21 -04:00
Paul Davis
8877199ae0
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
Paul Davis
4258a34912
change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample
2013-04-12 11:15:45 -04:00
Paul Davis
ecfd2a7455
remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor
2013-04-12 11:09:49 -04:00
Robin Gareus
6ae4f10437
Merge branch 'master' into cairocanvas
...
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
Robin Gareus
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
Robin Gareus
6830d83236
vtl: make videotimeline work with new cairo canvas
...
timeline thumbnail display, moving (drag/drop) and zoom works.
There still some crashes e.g. resizing the height of the timeline
and with off-screen image buffering when zooming in.
Likely due to concurrency issues:
VideoImageFrame::exposeimg() and direct access of the pixbuf:
"Assertion `!_bounding_box_dirty' failed." in canvas/item.cc:191
more work is needed..
2013-04-06 04:10:27 +02:00
Paul Davis
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
Robin Gareus
b358a09165
vtl: A/V sync lock on import
...
When extracting and importing audio from a video,
mark the audio region's position as locked to the
video.
While locked, the audio region can only be moved
by moving the video with a granularity of one Timecode
frame.
2013-04-04 15:44:32 +02:00
Robin Gareus
950643462a
vtl: prepare audio offset on A/V import
2013-03-28 16:58:30 +01:00
Robin Gareus
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
