fix computation of Text bounding box to respect _clamped_width

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 42ff531a3579e7ccbd454c3c7127e93ed86ee66e..a99dcdd253721c2b65c370d53ca416760b419c67 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -39,6 +39,9 @@
 
 #include "pbd/statefuldestructible.h"
 
+#include "canvas/fwd.h"
+#include "gtkmm2ext/visibility_tracker.h"
+
 #include "editing.h"
 #include "selection.h"
 
@@ -66,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;
@@ -96,7 +95,7 @@ using ARDOUR::framecnt_t;
  * of PublicEditor need not be recompiled if private methods or member variables
  * change.
  */
-class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
+class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, public Gtkmm2ext::VisibilityTracker {
   public:
        PublicEditor ();
        virtual ~PublicEditor ();
@@ -210,7 +209,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual void maybe_locate_with_edit_preroll (framepos_t location) = 0;
        virtual void set_show_measures (bool yn) = 0;
        virtual bool show_measures () const = 0;
-       virtual bool redraw_measures () = 0;
 
        virtual Editing::MouseMode effective_mouse_mode () const = 0;
 
@@ -234,7 +232,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual void add_toplevel_controls (Gtk::Container&) = 0;
        virtual void set_zoom_focus (Editing::ZoomFocus) = 0;
        virtual Editing::ZoomFocus get_zoom_focus () const = 0;
-       virtual gdouble   get_current_zoom () const = 0;
+       virtual framecnt_t get_current_zoom () const = 0;
        virtual PlaylistSelector& playlist_selector() const = 0;
        virtual void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>) = 0;
        virtual void new_playlists (TimeAxisView*) = 0;
@@ -287,8 +285,10 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0;
        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;
+        virtual void edit_notes (TimeAxisViewItem&) = 0;
 
        virtual void queue_visual_videotimeline_update () = 0;
+       virtual void set_close_video_sensitive (bool) = 0;
        virtual void toggle_ruler_video (bool) = 0;
        virtual void toggle_xjadeo_proc (int) = 0;
        virtual void toggle_xjadeo_viewoption (int, int) = 0;
@@ -296,15 +296,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        virtual int  get_videotl_bar_height () const = 0;
        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;
-
-#ifdef WITH_CMT
-       virtual void connect_to_image_compositor()  = 0;
-       virtual void add_imageframe_time_axis(const std::string & track_name, void*)  = 0;
-       virtual void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*)  = 0;
-       virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)  = 0;
-       virtual TimeAxisView* get_named_time_axis(const std::string & name)  = 0;
-#endif
+       virtual void export_video (bool range = false) = 0;
 
        virtual RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0;
 
@@ -355,17 +347,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
        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;
@@ -381,7 +362,11 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 #endif
 
        virtual ArdourCanvas::Group* get_trackview_group () const = 0;
-       virtual ArdourCanvas::Group* get_background_group () const = 0;
+       virtual ArdourCanvas::Group* get_time_bars_group () const = 0;
+       virtual ArdourCanvas::Group* get_track_canvas_group () const = 0;
+
+        virtual ArdourCanvas::GtkCanvasViewport* get_time_bars_canvas() const = 0;
+        virtual ArdourCanvas::GtkCanvasViewport* get_track_canvas() const = 0;
 
        virtual TimeAxisView* axis_view_from_route (boost::shared_ptr<ARDOUR::Route>) const = 0;
 
@@ -414,8 +399,6 @@ 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;