X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=884a1b351b35ce85f4698423bf7a00878d35ca67;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=af66415a6589fecdae0221183557f2680e5d9105;hpb=7a0b2e1c18cdc0447581f6a8024377c1b4b1c52a;p=ardour.git diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index af66415a65..884a1b351b 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -84,6 +84,13 @@ class VerboseCursor; class XMLNode; struct SelectionRect; +class DisplaySuspender; + +namespace ARDOUR_UI_UTILS { +bool relay_key_press (GdkEventKey* ev, Gtk::Window* win); +bool forward_key_press (GdkEventKey* ev); +} + using ARDOUR::framepos_t; using ARDOUR::framecnt_t; @@ -134,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. @@ -164,25 +173,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi */ virtual Editing::MouseMode current_mouse_mode () const = 0; - /** Switch into a mode in which editing is primarily focused on "within" regions, - rather than regions as black-box objects. For Ardour3, this is aimed at - editing MIDI regions but may expand in the future to other types of regions. - */ - - virtual void set_internal_edit (bool yn) = 0; - - /** Driven by a double-click, switch in or out of a mode in which - editing is primarily focused on "within" regions, rather than - regions as black-box objects. For Ardour3, this is aimed at editing - MIDI regions but may expand in the future to other types of - regions. - */ - - virtual bool toggle_internal_editing_from_double_click (GdkEvent*) = 0; - - /** @return Whether editing is currently in "internal" mode or not + /** @return Whether the current mouse mode is an "internal" editing mode. */ - virtual bool internal_editing() const = 0; /** Possibly start the audition of a region. If @param r is 0, or not an AudioRegion @@ -206,6 +198,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual void play_selection () = 0; 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 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; @@ -228,10 +223,12 @@ 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; + virtual void reset_zoom (framecnt_t) = 0; virtual PlaylistSelector& playlist_selector() const = 0; virtual void clear_playlist (boost::shared_ptr) = 0; virtual void new_playlists (TimeAxisView*) = 0; @@ -266,9 +263,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi 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, bool at_top = false) { - _ensure_time_axis_view_is_visible (tav, at_top); - } + virtual void ensure_time_axis_view_is_visible (TimeAxisView const & tav, bool at_top = false) = 0; virtual void override_visible_track_count () = 0; virtual void scroll_tracks_down_line () = 0; virtual void scroll_tracks_up_line () = 0; @@ -277,17 +272,22 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual void prepare_for_cleanup () = 0; virtual void finish_cleanup () = 0; virtual void reset_x_origin (framepos_t frame) = 0; + virtual double get_y_origin () const = 0; + virtual void reset_y_origin (double pos) = 0; 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 (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; virtual void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0; virtual void mouse_add_new_marker (framepos_t where, bool is_cd=false, bool is_xrun=false) = 0; virtual void foreach_time_axis_view (sigc::slot) = 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; @@ -331,6 +331,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual bool canvas_fade_out_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0; virtual bool canvas_fade_out_handle_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*, bool) = 0; virtual bool canvas_region_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_wave_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; @@ -338,7 +339,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; @@ -364,10 +364,10 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual Gtk::HBox& get_status_bar_packer() = 0; #endif - virtual ArdourCanvas::Group* get_trackview_group () const = 0; - virtual ArdourCanvas::Group* get_hscroll_group () const = 0; - virtual ArdourCanvas::Group* get_vscroll_group () const = 0; - virtual ArdourCanvas::Group* get_hvscroll_group () const = 0; + virtual ArdourCanvas::Container* get_trackview_group () const = 0; + virtual ArdourCanvas::ScrollGroup* get_hscroll_group () const = 0; + virtual ArdourCanvas::ScrollGroup* get_vscroll_group () const = 0; + virtual ArdourCanvas::ScrollGroup* get_hvscroll_group () const = 0; virtual ArdourCanvas::GtkCanvasViewport* get_track_canvas() const = 0; @@ -389,6 +389,10 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual void stop_canvas_autoscroll () = 0; virtual bool autoscroll_active() const = 0; + virtual void begin_reversible_command (std::string cmd_name) = 0; + virtual void begin_reversible_command (GQuark) = 0; + virtual void commit_reversible_command () = 0; + virtual MouseCursors const * cursors () const = 0; virtual VerboseCursor * verbose_cursor () const = 0; @@ -399,22 +403,44 @@ 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; + virtual void get_regionviews_by_id (PBD::ID const & id, RegionSelection & regions) const = 0; /// Singleton instance, set up by Editor::Editor() static PublicEditor* _instance; - friend bool relay_key_press (GdkEventKey*, Gtk::Window*); - friend bool forward_key_press (GdkEventKey*); + friend bool ARDOUR_UI_UTILS::relay_key_press (GdkEventKey*, Gtk::Window*); + friend bool ARDOUR_UI_UTILS::forward_key_press (GdkEventKey*); PBD::Signal0 SnapChanged; PBD::Signal0 MouseModeChanged; protected: - virtual void _ensure_time_axis_view_is_visible (const TimeAxisView& tav, bool at_top) = 0; + friend class DisplaySuspender; + virtual void suspend_route_redisplay () = 0; + virtual void resume_route_redisplay () = 0; + gint _suspend_route_redisplay_counter; +}; + +class DisplaySuspender { + public: + DisplaySuspender() { + if (g_atomic_int_add(&PublicEditor::instance()._suspend_route_redisplay_counter, 1) == 0) { + PublicEditor::instance().suspend_route_redisplay (); + } + } + ~DisplaySuspender () { + if (g_atomic_int_dec_and_test (&PublicEditor::instance()._suspend_route_redisplay_counter)) { + PublicEditor::instance().resume_route_redisplay (); + } + } }; #endif // __gtk_ardour_public_editor_h__