X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=3fc2b878b09d111e2cf48afc5db4fe2bf79eaa26;hb=af3056769cdc09d9ce3b21f9f8e0aa8145ed8f0e;hp=ce21b8a40dd2779d9d35d48bfbf0ff64c59bbe3a;hpb=9301991f6e77f16c6cefe3f0c92fdc02da687f8b;p=ardour.git diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index ce21b8a40d..3fc2b878b0 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -39,8 +39,10 @@ #include "pbd/statefuldestructible.h" +#include "canvas/fwd.h" +#include "gtkmm2ext/visibility_tracker.h" + #include "editing.h" -#include "canvas.h" #include "selection.h" namespace ARDOUR { @@ -67,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; @@ -97,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 (); @@ -199,12 +197,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void separate_region_from_selection () = 0; virtual void transition_to_rolling (bool fwd) = 0; - virtual framepos_t unit_to_frame (double unit) const = 0; - virtual double frame_to_unit (framepos_t frame) const = 0; - virtual double frame_to_unit (double frame) const = 0; - virtual double frame_to_unit_unrounded (framepos_t frame) const = 0; - virtual framepos_t pixel_to_frame (double pixel) const = 0; - virtual gulong frame_to_pixel (framepos_t frame) const = 0; + virtual framepos_t pixel_to_sample (double pixel) const = 0; + virtual double sample_to_pixel (framepos_t frame) const = 0; + virtual double sample_to_pixel_unrounded (framepos_t frame) const = 0; virtual Selection& get_selection () const = 0; virtual Selection& get_cut_buffer () const = 0; virtual void track_mixer_selection () = 0; @@ -214,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; @@ -238,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) = 0; virtual void new_playlists (TimeAxisView*) = 0; @@ -269,9 +263,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual bool dragging_playhead () const = 0; virtual void ensure_float (Gtk::Window&) = 0; 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 framepos_t leftmost_sample() const = 0; + virtual framecnt_t current_page_samples() 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; @@ -291,9 +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; -#ifdef WITH_VIDEOTIMELINE 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; @@ -302,15 +297,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; - 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 RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0; @@ -348,9 +334,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; @@ -363,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; @@ -388,10 +361,12 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual Gtk::HBox& get_status_bar_packer() = 0; #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; + 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) const = 0;