Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ce21b8a40dd2779d9d35d48bfbf0ff64c59bbe3a..89c75bdd948361f33ee6c0269e427030f36bb870 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -40,7 +40,6 @@
 #include "pbd/statefuldestructible.h"
 
 #include "editing.h"
-#include "canvas.h"
 #include "selection.h"
 
 namespace ARDOUR {
@@ -271,7 +270,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual void show_window () = 0;
        virtual framepos_t leftmost_position() const = 0;
        virtual framecnt_t current_page_frames() const = 0;
-       virtual double canvas_height () const = 0;
+       virtual double visible_canvas_height () const = 0;
        virtual void temporal_zoom_step (bool coarser) = 0;
        virtual void ensure_time_axis_view_is_visible (const TimeAxisView& tav) = 0;
        virtual void scroll_tracks_down_line () = 0;
@@ -292,7 +291,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0;
        virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position) = 0;
 
-#ifdef WITH_VIDEOTIMELINE
        virtual void queue_visual_videotimeline_update () = 0;
        virtual void toggle_ruler_video (bool) = 0;
        virtual void toggle_xjadeo_proc (int) = 0;
@@ -302,7 +300,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual void set_video_timeline_height (const int h) = 0;
        virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0;
        virtual void export_video () = 0;
-#endif
 
 #ifdef WITH_CMT
        virtual void connect_to_image_compositor()  = 0;
@@ -348,9 +345,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0;
        virtual bool canvas_stream_view_event (GdkEvent* event, ArdourCanvas::Item*, RouteTimeAxisView*) = 0;
        virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, Marker*) = 0;
-#ifdef WITH_VIDEOTIMELINE
        virtual bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
-#endif
        virtual bool canvas_zoom_rect_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
        virtual bool canvas_tempo_marker_event (GdkEvent* event, ArdourCanvas::Item*, TempoMarker*) = 0;
        virtual bool canvas_meter_marker_event (GdkEvent* event, ArdourCanvas::Item*, MeterMarker*) = 0;
@@ -389,7 +384,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 #endif
 
        virtual gdouble get_trackview_group_vertical_offset () const = 0;
-       virtual double get_canvas_timebars_vsize () const = 0;
        virtual ArdourCanvas::Group* get_trackview_group () const = 0;
        virtual ArdourCanvas::Group* get_background_group () const = 0;
 
@@ -424,6 +418,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 
        virtual void get_regions_at (RegionSelection &, framepos_t where, TrackViewList const &) const = 0;
 
+       virtual void save_canvas_state () = 0;
+
        /// Singleton instance, set up by Editor::Editor()
 
        static PublicEditor* _instance;