Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 43d3fccedf9217d654296771d92cfd523fec7136..9f288defe3b38bad1af33f01723a14c0c1b8e38b 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -786,9 +786,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
                ruler_time_range_marker = 7,
                ruler_time_transport_marker = 8,
                ruler_time_cd_marker = 9,
-#ifdef WITH_VIDEOTIMELINE
                ruler_video_timeline = 10,
-#endif
        };
 
        static GtkCustomMetric ruler_metrics[4];
@@ -922,8 +920,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        Gtk::Label  transport_mark_label;
        Gtk::Label  cd_mark_label;
 
-#ifdef WITH_VIDEOTIMELINE
-       ArdourCanvas::Rectangle* videotl_bar;
+       /* videtimline related actions */
+       ArdourCanvas::Rectangle*  videotl_bar;
        Gtk::Label                videotl_label;
        ArdourCanvas::Group*      videotl_bar_group;
        ArdourCanvas::Group*      videotl_group;
@@ -946,7 +944,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        int get_videotl_bar_height () const { return videotl_bar_height; }
        void export_video ();
        void toggle_region_video_lock ();
-#endif
 
        Gtk::VBox          time_bars_vbox;
 
@@ -1454,7 +1451,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_cd_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
-#ifdef WITH_VIDEOTIMELINE
+
        bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        void update_video_timeline (bool flush = false);
        void set_video_timeline_height (const int);
@@ -1463,7 +1460,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void set_video_timeline_locked (const bool);
        void queue_visual_videotimeline_update ();
        void embed_audio_from_video (std::string, framepos_t n = 0);
-#endif
 
        bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
        bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*);
@@ -2181,9 +2177,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        friend class RegionCreateDrag;
        friend class RegionMotionDrag;
        friend class RegionInsertDrag;
-#ifdef WITH_VIDEOTIMELINE
        friend class VideoTimeLineDrag;
-#endif
 
        friend class EditorSummary;
        friend class EditorGroupTabs;