diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
| commit | 11619a37bff79c050e39e434bc9899b516cbe4a1 (patch) | |
| tree | b95d913f0af41800a50298185c9ab4c42a12110d /gtk2_ardour/public_editor.h | |
| parent | 46b6987311a305c1de718f8e73f365b796572c45 (diff) | |
| parent | 77ac803ba0b250cab5aa1778f8613d00020df82f (diff) | |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor_canvas.cc
gtk2_ardour/imageframe_time_axis.cc
gtk2_ardour/imageframe_time_axis.h
gtk2_ardour/imageframe_time_axis_group.cc
gtk2_ardour/imageframe_time_axis_group.h
gtk2_ardour/imageframe_time_axis_view.cc
gtk2_ardour/imageframe_time_axis_view.h
gtk2_ardour/imageframe_view.cc
gtk2_ardour/imageframe_view.h
gtk2_ardour/marker_time_axis.cc
gtk2_ardour/marker_time_axis.h
gtk2_ardour/marker_time_axis_view.cc
gtk2_ardour/marker_time_axis_view.h
gtk2_ardour/marker_view.cc
gtk2_ardour/marker_view.h
gtk2_ardour/video_image_frame.cc
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/visual_time_axis.h
libs/canvas/canvas/circle.h
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 3edf2e64ad..76d888106f 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -69,11 +69,7 @@ class AutomationTimeAxisView; class ControlPoint; class DragManager; class Editor; -class ImageFrameTimeAxis; -class ImageFrameView; class Marker; -class MarkerTimeAxis; -class MarkerView; class MeterMarker; class MouseCursors; class PlaylistSelector; @@ -351,17 +347,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; virtual bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*) = 0; -#ifdef WITH_CMT - virtual bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; - virtual bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*) = 0; - virtual bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; - virtual bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; - virtual bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerTimeAxis*) = 0; - virtual bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; - virtual bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; - virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; -#endif - static const int window_border_width; static const int container_border_width; static const int vertical_spacing; |