4e84bc3a39
changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master
2013-04-12 21:46:44 -04:00
b05968fb4e
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
8877199ae0
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
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
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
f208593249
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
2013-04-11 22:54:22 -04:00
7caf517b27
add (bezier) curves to canvas, use for automation lines; fix issue with rectangles missing their upper line segment; more cairo canvas fixes
2013-04-11 22:54:12 -04:00
ee1f0520a8
many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues
2013-04-11 20:19:22 -04:00
1fda7b293a
fix up positioning of verbose cursor if it is too close to the bottom of the canvas (for MidiRegionView)
2013-04-11 20:01:14 -04:00
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
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
b7c617b057
possible fix for #5441 -- ardour hangs on shutdown (trying to stop harvid/xjadeo)
2013-04-10 23:41:44 +02:00
ca1d58c254
vtl: remove inadvertently committed CURLERRORDEBUG
2013-04-10 23:40:23 +02:00
204da61f98
remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info
2013-04-10 14:42:36 -04:00
9a8ee11f65
Merge branch 'master' into cairocanvas
2013-04-10 12:37:16 -04:00
a1745f2cf1
remove debugging output
2013-04-10 10:53:21 -04:00
97da762c50
make size/shape of playhead cursor match gnomecanvas version
2013-04-10 10:24:17 -04:00
6592c8696a
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-09 14:25:02 -04:00
bca507a808
Merge branch 'master' into cairocanvas
2013-04-09 14:23:41 -04:00
053eaf77fd
a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff
2013-04-09 14:22:58 -04:00
082de27a4e
vtl: query video-monitor-state on explicit session save
2013-04-09 17:13:42 +02:00
722d7f4de6
update all i18n .po files
2013-04-09 09:32:14 -04:00
ed1f310f10
vtl: rework session-needs-save logic
...
* videotimeline now immediately marks the session dirty on
every state-changing operation
* video-montor is polled every 2.5 seconds for menu-relevant state info
(ontop, OSD,..) and every 30 seconds for full state (window pos, size,..)
* new interface to query the video-monitor for its state and wait for
all replies - terminating the process and using ::wait() is no longer
required
* Ardour> quit and Ardour > close-session does no longer close the video
session to enforce video-monitor state sync but uses above new interface
2013-04-09 04:05:46 +02:00
49ddf8ecce
vtl: disconnect from session-save signal
...
the videotimeline is a global unique instance that is allocated during
startup and deleted on exit. The Scopedconnection is not deleted
with the session.
2013-04-09 04:05:42 +02:00
8a3ebe7510
vtl: resume if "don't close/exit" is selected
2013-04-09 04:05:34 +02:00
18048747b6
fix up marker text color
2013-04-08 19:47:54 -04:00
f7abf2de82
vtl: mark session dirty if video position-lock or timeline height changes
2013-04-08 21:17:48 +02:00
c7daf40358
mark session dirty if video is moved
2013-04-08 21:11:17 +02:00
8630fd1703
add session save signal and hook-up videotimeline
2013-04-08 19:51:48 +02:00
Julien de Kozak
019af63914
Fix name spelling
2013-04-08 19:23:38 +02:00
22b3744fb8
remove message about checking for announcements
2013-04-08 12:00:19 -04:00
23cac60a2f
add julien dekozak to the authors list
2013-04-08 09:30:39 -04:00
fc787fad50
canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too
2013-04-06 16:39:11 -04:00
6b5846ab95
fix up unusued args warning in nsm code
2013-04-06 16:38:29 -04:00
81506ea41c
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
2013-04-06 16:12:27 -04:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
cd6cbba299
rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit
2013-04-06 16:04:02 -04:00
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
67e4f49064
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-05 22:05:33 -04:00
cd0d68a591
mark the step entry dialog as a dialog even though it is an ArdourWindow, to help with WM layering issues
2013-04-05 18:00:59 -04:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
6c7a61f6e5
Fix display of Spectral Analysis when no tracks are selected.
...
Spectral Analysis now displays graphs for selected regions, even when there
are no tracks selected. Fixes #2226 .
2013-04-05 17:49:31 +01:00
fcf7530676
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-05 12:00:42 -04:00
55a1048094
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-04-05 11:54:34 -04:00
07a505b1b2
lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure
2013-04-05 11:27:26 -04:00
096fe04e61
Make track header faders insensitive to vertical scroll-wheel events again.
...
This effectively reverts d235a27a
2013-04-05 10:08:36 +01:00
19bd641915
commit immediately post linking
2013-04-04 18:45:27 -04:00
3f97d8c6d5
vtl: remove obvious warning
2013-04-05 00:15:57 +02:00
7fe22a7af3
vtl: overall export progress bar
2013-04-04 23:40:36 +02:00
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
