X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=6c2e5c6f0ab4c176cae498ed36b6f687b5c8eb06;hb=e25dce8849719f382a84fb82c7fd657465f1b2a1;hp=63778dfaec3f926242a8c3e6c35ef78ef6b2d470;hpb=e1f168de110322e7024dfa334b97f3b433907ae1;p=ardour.git diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 63778dfaec..6c2e5c6f0a 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -32,16 +32,19 @@ #include #include #include +#include #include +#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" @@ -61,10 +64,6 @@ namespace Gtk { class Menu; } -namespace Gtkmm2ext { - class TearOff; -} - class AudioRegionView; class AutomationLine; class AutomationTimeAxisView; @@ -104,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 */ @@ -199,6 +198,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi 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; @@ -206,12 +206,15 @@ 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; 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; /** Import existing media */ @@ -231,8 +234,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; @@ -266,8 +267,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; @@ -286,8 +285,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; @@ -325,7 +322,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi Glib::RefPtr editor_menu_actions; Glib::RefPtr _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; @@ -364,15 +361,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; @@ -390,9 +378,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual TrackViewList axis_views_from_routes (boost::shared_ptr) 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; @@ -405,6 +390,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; @@ -421,6 +408,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi bool for_mark = false) = 0; virtual void get_regions_at (RegionSelection &, framepos_t where, TrackViewList const &) const = 0; + virtual void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const = 0; virtual RegionSelection get_regions_from_selection_and_mouse (framepos_t) = 0; virtual void get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const = 0; virtual void get_per_region_note_selection (std::list > > > >&) const = 0; @@ -440,6 +428,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi PBD::Signal0 SnapChanged; PBD::Signal0 MouseModeChanged; + Gtkmm2ext::Bindings* bindings; + protected: friend class DisplaySuspender; virtual void suspend_route_redisplay () = 0; @@ -466,11 +456,11 @@ public: MainMenuDisabler () { /* The global menu bar continues to be accessible to applications with modal dialogs on mac, which means that we need to desensitize - all items in the menu bar. + all items in the menu bar. */ ActionManager::disable_active_actions (); } - + ~MainMenuDisabler () { ActionManager::enable_active_actions (); }