diff options
author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /gtk2_ardour/editor_canvas_events.cc | |
parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
-rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 9bceb1c26c..afbfff2248 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -948,13 +948,11 @@ Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item) return typed_event (item, event, CdMarkerBarItem); } -#ifdef WITH_VIDEOTIMELINE bool Editor::canvas_videotl_bar_event (GdkEvent *event, ArdourCanvas::Item* item) { return typed_event (item, event, VideoBarItem); } -#endif bool Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* /*marker*/) |