Trim dependence on evoral types.hpp and Beats.hpp

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 90ee30dbcaedb6112225414a256f42337cb3f250..519a714c79ce71969fe44b37d5dc7a7f3f34c282 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -35,14 +35,16 @@
 #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"
 
 #include "editing.h"
@@ -62,10 +64,6 @@ namespace Gtk {
        class Menu;
 }
 
-namespace Gtkmm2ext {
-        class TearOff;
-}
-
 class AudioRegionView;
 class AutomationLine;
 class AutomationTimeAxisView;
@@ -105,9 +103,9 @@ 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, public Gtkmm2ext::VisibilityTracker {
+class PublicEditor : public Gtkmm2ext::Tabbable {
   public:
-       PublicEditor ();
+       PublicEditor (Gtk::Widget& content);
        virtual ~PublicEditor ();
 
        /** @return Singleton PublicEditor instance */
@@ -207,6 +205,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        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;
@@ -232,8 +231,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        virtual void export_range () = 0;
 
        virtual void register_actions () = 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;
@@ -267,8 +264,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
 
        /** @return true if the playhead is currently being dragged, otherwise false */
        virtual bool dragging_playhead () const = 0;
-       virtual void ensure_float (Gtk::Window&) = 0;
-       virtual void show_window () = 0;
        virtual framepos_t leftmost_sample() const = 0;
        virtual framecnt_t current_page_samples() const = 0;
        virtual double visible_canvas_height () const = 0;
@@ -287,8 +282,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        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;
@@ -326,7 +319,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        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;
@@ -365,15 +358,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        static const int vertical_spacing;
        static const int horizontal_spacing;
 
-#ifdef TOP_MENUBAR
-       /*
-        * This is needed for OS X primarily
-        * but also any other OS that uses a single
-        * top menubar instead of per window menus
-        */
-       virtual Gtk::HBox& get_status_bar_packer() = 0;
-#endif
-
        virtual ArdourCanvas::Container* get_trackview_group () const = 0;
        virtual ArdourCanvas::ScrollGroup* get_hscroll_group () const = 0;
        virtual ArdourCanvas::ScrollGroup* get_hvscroll_group () const = 0;
@@ -391,9 +375,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        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;
@@ -406,6 +387,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        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;
 
@@ -442,11 +425,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
        PBD::Signal0<void> SnapChanged;
        PBD::Signal0<void> MouseModeChanged;
 
-       Gtk::Notebook& tabs() { return _tabs; }
-       
-  protected:
-       Gtk::Notebook _tabs;
+       Gtkmm2ext::Bindings* bindings;
 
+  protected:
        friend class DisplaySuspender;
        virtual void suspend_route_redisplay () = 0;
        virtual void resume_route_redisplay () = 0;