X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=6c2e5c6f0ab4c176cae498ed36b6f687b5c8eb06;hb=e25dce8849719f382a84fb82c7fd657465f1b2a1;hp=8736ea4b61f72823029514637f743edce8202849;hpb=558167a5dd503363d87f55ebaabca8bd3062a282;p=ardour.git

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 8736ea4b61..6c2e5c6f0a 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -35,14 +35,15 @@
 #include <gtkmm/notebook.h>
 #include <sigc++/signal.h>
 
+#include "evoral/Beats.hpp"
 #include "evoral/Note.hpp"
-#include "evoral/types.hpp"
 
 #include "pbd/statefuldestructible.h"
 
 #include "canvas/fwd.h"
 
 #include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/tabbable.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
@@ -63,10 +64,6 @@ namespace Gtk {
 	class Menu;
 }
 
-namespace Gtkmm2ext {
-        class TearOff;
-}
-
 class AudioRegionView;
 class AutomationLine;
 class AutomationTimeAxisView;
@@ -201,6 +198,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	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 bool get_selection_extents (framepos_t &start, framepos_t &end) const = 0;
 	virtual Selection& get_cut_buffer () const = 0;
 	virtual void track_mixer_selection () = 0;
 	virtual bool extend_selection_to_track (TimeAxisView&) = 0;
@@ -208,11 +206,14 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	virtual void play_with_preroll () = 0;
 	virtual void maybe_locate_with_edit_preroll (framepos_t location) = 0;
 	virtual void goto_nth_marker (int nth) = 0;
+	virtual void trigger_script (int nth) = 0;
 	virtual void add_location_from_playhead_cursor () = 0;
 	virtual void remove_location_at_playhead_cursor () = 0;
 	virtual void set_show_measures (bool yn) = 0;
 	virtual bool show_measures () const = 0;
 	virtual void remove_tracks () = 0;
+	virtual void set_loop_range (framepos_t start, framepos_t end, std::string cmd) = 0;
+	virtual void set_punch_range (framepos_t start, framepos_t end, std::string cmd) = 0;
 
 	virtual Editing::MouseMode effective_mouse_mode () const = 0;
 
@@ -284,8 +285,6 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	virtual void remove_last_capture () = 0;
 	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 (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0;
 	virtual void toggle_meter_updating() = 0;
 	virtual void split_regions_at (framepos_t, RegionSelection&) = 0;
@@ -323,7 +322,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	Glib::RefPtr<Gtk::ActionGroup> editor_menu_actions;
 	Glib::RefPtr<Gtk::ActionGroup> _region_actions;
 
-	virtual void reset_focus () = 0;
+	virtual void reset_focus (Gtk::Widget*) = 0;
 
 	virtual bool canvas_scroll_event (GdkEventScroll* event, bool from_canvas) = 0;
 	virtual bool canvas_control_point_event (GdkEvent* event, ArdourCanvas::Item*, ControlPoint*) = 0;
@@ -379,9 +378,6 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	virtual TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const = 0;
 	virtual TrackViewList const & get_track_views () = 0;
 
-	virtual Gtkmm2ext::TearOff* mouse_mode_tearoff () const = 0;
-	virtual Gtkmm2ext::TearOff* tools_tearoff () const = 0;
-
 	virtual DragManager* drags () const = 0;
         virtual void maybe_autoscroll (bool, bool, bool from_headers) = 0;
 	virtual void stop_canvas_autoscroll () = 0;
@@ -394,6 +390,8 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	virtual void abort_reversible_command () = 0;
 	virtual void commit_reversible_command () = 0;
 
+	virtual void access_action (std::string,std::string) = 0;
+
 	virtual MouseCursors const * cursors () const = 0;
 	virtual VerboseCursor * verbose_cursor () const = 0;
 
@@ -430,6 +428,8 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
 	PBD::Signal0<void> SnapChanged;
 	PBD::Signal0<void> MouseModeChanged;
 
+	Gtkmm2ext::Bindings* bindings;
+
   protected:
 	friend class DisplaySuspender;
 	virtual void suspend_route_redisplay () = 0;