Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index c5bf8a006ba6c5cf5eb2ecd3cb9feaaade4e6ad6..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;
@@ -385,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;
 
@@ -420,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;