lots more color work, closer and closer to being ready for ... being taken apart...

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 17d43e0bf49ec013e44504fb8e9a1e4bf898ca01..9969d9d49e63dcdb13c2e57e525b60d28d8551ae 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -141,7 +141,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual void set_snap_threshold (double t) = 0;
 
        /** Snap a value according to the current snap setting. */
-       virtual void snap_to (framepos_t& first, int32_t direction = 0, bool for_mark = false) = 0;
+       virtual void snap_to (framepos_t&       first,
+                             ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
+                             bool              for_mark  = false) = 0;
 
        /** Undo some transactions.
         * @param n Number of transactions to undo.
@@ -238,7 +240,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual void export_range () = 0;
 
        virtual void register_actions () = 0;
-       virtual void add_toplevel_controls (Gtk::Container&) = 0;
+       virtual void add_transport_frame (Gtk::Container&) = 0;
+       virtual void add_toplevel_menu (Gtk::Container&) = 0;
        virtual void set_zoom_focus (Editing::ZoomFocus) = 0;
        virtual Editing::ZoomFocus get_zoom_focus () const = 0;
        virtual framecnt_t get_current_zoom () const = 0;
@@ -289,6 +292,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual void maximise_editing_space () = 0;
        virtual void restore_editing_space () = 0;
        virtual void update_tearoff_visibility () = 0;
+       virtual void reattach_all_tearoffs () = 0;
        virtual framepos_t get_preferred_edit_position (bool ignore_playhead = false, bool from_context_menu = false) = 0;
        virtual void toggle_meter_updating() = 0;
        virtual void split_regions_at (framepos_t, RegionSelection&) = 0;
@@ -297,6 +301,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>) = 0;
        virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0;
        virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0;
+       virtual framecnt_t get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t duration) = 0;
        virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position) = 0;
         virtual void edit_notes (TimeAxisViewItem&) = 0;
 
@@ -348,7 +353,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual bool canvas_stream_view_event (GdkEvent* event, ArdourCanvas::Item*, RouteTimeAxisView*) = 0;
        virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, Marker*) = 0;
        virtual bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
-       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;
        virtual bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) = 0;
@@ -409,7 +413,10 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual ARDOUR::Location* find_location_from_marker (Marker *, bool &) const = 0;
        virtual Marker* find_marker_from_location_id (PBD::ID const &, bool) const = 0;
 
-       virtual void snap_to_with_modifier (framepos_t &, GdkEvent const *, int32_t direction = 0, bool for_mark = false) = 0;
+       virtual void snap_to_with_modifier (framepos_t &      first,
+                                           GdkEvent const *  ev,
+                                           ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
+                                           bool              for_mark  = false) = 0;
 
        virtual void get_regions_at (RegionSelection &, framepos_t where, TrackViewList const &) const = 0;
        virtual RegionSelection get_regions_from_selection_and_mouse (framepos_t) = 0;