X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=8ff19580c626861180132e25258e068e001da87e;hb=34da2896c636a18376f0da2da8c2732f52c99461;hp=6cb1bc40b6ad7e93df165f017afefa50d25bbc77;hpb=260058a4a966462fe4835b15f31aa2ac3dcfd8d3;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6cb1bc40b6..8ff19580c6 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -67,6 +67,10 @@ namespace Gtkmm2ext { class Bindings; } +namespace Evoral { + class SMF; +} + namespace ARDOUR { class AudioPlaylist; class AudioRegion; @@ -130,6 +134,7 @@ class SoundFileOmega; class StreamView; class TempoLines; class TimeAxisView; +class TimeInfoBox; class TimeFXDialog; class TimeSelection; class RegionLayeringOrderEditor; @@ -251,14 +256,13 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Selection& get_selection() const { return *selection; } bool get_selection_extents (framepos_t &start, framepos_t &end) const; // the time extents of the current selection, whether Range, Region(s), Control Points, or Notes Selection& get_cut_buffer() const { return *cut_buffer; } - void track_mixer_selection (); bool extend_selection_to_track (TimeAxisView&); void play_selection (); - framepos_t get_preroll (); void maybe_locate_with_edit_preroll (framepos_t); void play_with_preroll (); + void rec_with_preroll (); void select_all_in_track (Selection::Operation op); void select_all_objects (Selection::Operation op); void invert_selection_in_track (); @@ -297,8 +301,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; } framecnt_t get_current_zoom () const { return samples_per_pixel; } void cycle_zoom_focus (); - void temporal_zoom_step (bool coarser); - void temporal_zoom_step_mouse_focus (bool coarser); + void temporal_zoom_step (bool zoom_out); + void temporal_zoom_step_scale (bool zoom_out, double scale); + void temporal_zoom_step_mouse_focus (bool zoom_out); + void temporal_zoom_step_mouse_focus_scale (bool zoom_out, double scale); void ensure_time_axis_view_is_visible (TimeAxisView const & tav, bool at_top); void tav_zoom_step (bool coarser); void tav_zoom_smooth (bool coarser, bool force_all); @@ -330,6 +336,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD unsigned get_grid_beat_divisions(framepos_t position); Evoral::Beats get_grid_type_as_beats (bool& success, framepos_t position); + int32_t get_grid_music_divisions (uint32_t event_state); + void nudge_forward (bool next, bool force_playhead); void nudge_backward (bool next, bool force_playhead); @@ -358,8 +366,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* fades */ - void toggle_region_fades (int dir); - void update_region_fade_visibility (); + void toggle_region_fades (int dir); + void update_region_fade_visibility (); /* redirect shared ops menu. caller must free returned menu */ @@ -424,6 +432,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Editing::ImportDisposition disposition, Editing::ImportMode mode, ARDOUR::SrcQuality quality, + ARDOUR::MidiTrackNameSource mts, + ARDOUR::MidiTempoMapDisposition mtd, framepos_t& pos, boost::shared_ptr instrument = boost::shared_ptr()); @@ -532,7 +542,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* editing operations that need to be public */ void mouse_add_new_marker (framepos_t where, bool is_cd=false); - void split_regions_at (framepos_t, RegionSelection&); + void split_regions_at (framepos_t, RegionSelection&, const int32_t sub_num, bool snap = true); void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false); RegionSelection get_regions_from_selection_and_mouse (framepos_t); @@ -561,6 +571,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD PlaylistSelector* _playlist_selector; + TimeInfoBox* _time_info_box; + typedef std::pair TAVState; struct VisualState { @@ -613,6 +625,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD boost::optional pre_notebook_shrink_pane_width; + Gtk::VBox _editor_list_vbox; Gtk::Notebook _the_notebook; bool _notebook_shrunk; void add_notebook_page (std::string const &, Gtk::Widget &); @@ -641,6 +654,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void toggle_marker_lines (); void set_marker_line_visibility (bool); + void jump_forward_to_mark (); + void jump_backward_to_mark (); + uint32_t location_marker_color; uint32_t location_range_color; uint32_t location_loop_color; @@ -888,7 +904,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void update_just_timecode (); void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers void update_fixed_rulers (); - void update_tempo_based_rulers (std::vector& grid); + void update_tempo_based_rulers (); void popup_ruler_menu (framepos_t where = 0, ItemType type = RegionItem); void update_ruler_visibility (); void set_ruler_visible (RulerType, bool); @@ -951,7 +967,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD gint bbt_nmarks; uint32_t bbt_bar_helper_on; uint32_t bbt_accent_modulo; - void compute_bbt_ruler_scale (std::vector& grid, framepos_t lower, framepos_t upper); + void compute_bbt_ruler_scale (framepos_t lower, framepos_t upper); ArdourCanvas::Ruler* timecode_ruler; ArdourCanvas::Ruler* bbt_ruler; @@ -1005,7 +1021,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD friend class EditorCursor; - EditorCursor* playhead_cursor; + EditorCursor* playhead_cursor; + framepos_t playhead_cursor_sample () const; framepos_t get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, bool only_onscreen); @@ -1040,7 +1057,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::HBox toplevel_hpacker; - Gtk::HBox top_hbox; Gtk::HBox bottom_hbox; Gtk::Table edit_packer; @@ -1089,7 +1105,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void control_step_tracks_down (); void control_view (uint32_t); void control_scroll (float); - void control_select (ARDOUR::PresentationInfo::global_order_t which, Selection::Operation); + void control_select (boost::shared_ptr, Selection::Operation); void control_unselect (); void access_action (std::string,std::string); bool deferred_control_scroll (framepos_t); @@ -1131,7 +1147,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* track views */ TrackViewList track_views; std::pair trackview_by_y_position (double, bool trackview_relative_offset = true) const; - RouteTimeAxisView* axis_view_from_route (boost::shared_ptr) const; + TimeAxisView* axis_view_from_stripable (boost::shared_ptr) const; TrackViewList get_tracks_for_range_action () const; @@ -1188,7 +1204,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void cut_copy_midi (Editing::CutCopyOp); void mouse_paste (); - void paste_internal (framepos_t position, float times); + void paste_internal (framepos_t position, float times, const int32_t sub_num); /* EDITING OPERATIONS */ @@ -1274,14 +1290,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void naturalize_region (); - void reset_focus (Gtk::Widget*); - void split_region (); void delete_ (); void cut (); void copy (); - void paste (float times, bool from_context_menu = false); + void paste (float times, bool from_context_menu); void place_transient (); void remove_transient (ArdourCanvas::Item* item); @@ -1302,8 +1316,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void loop_location (ARDOUR::Location&); void calc_extra_zoom_edges(framepos_t &start, framepos_t &end); - void temporal_zoom_selection (bool both_axes = false); - void temporal_zoom_region (bool both_axes); + void temporal_zoom_selection (Editing::ZoomAxis); void temporal_zoom_session (); void temporal_zoom (framecnt_t samples_per_pixel); void temporal_zoom_by_frame (framepos_t start, framepos_t end); @@ -1326,8 +1339,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* import & embed */ void add_external_audio_action (Editing::ImportMode); - void external_audio_dialog (); - void session_import_dialog (); int check_whether_and_how_to_import(std::string, bool all_or_nothing = true); bool check_multichannel_status (const std::vector& paths); @@ -1390,6 +1401,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD AnalysisWindow* analysis_window; + /* import & embed */ + void external_audio_dialog (); + void session_import_dialog (); + /* import specific info */ struct EditorImportStatus : public ARDOUR::ImportStatus { @@ -1410,7 +1425,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void import_audio (bool as_tracks); void do_import (std::vector paths, bool split, bool as_tracks); - + void import_smf_tempo_map (Evoral::SMF const &, framepos_t pos); void move_to_start (); void move_to_end (); void center_playhead (); @@ -1428,8 +1443,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void clear_locations (); void unhide_markers (); void unhide_ranges (); - void jump_forward_to_mark (); - void jump_backward_to_mark (); void cursor_align (bool playhead_to_edit); void toggle_skip_playback (); @@ -1449,6 +1462,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_loop_from_selection (bool play); void set_punch_from_selection (); void set_punch_from_region (); + void set_auto_punch_range(); void set_session_start_from_playhead (); void set_session_end_from_playhead (); @@ -1459,7 +1473,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_loop_range (framepos_t start, framepos_t end, std::string cmd); void set_punch_range (framepos_t start, framepos_t end, std::string cmd); + void toggle_location_at_playhead_cursor (); void add_location_from_playhead_cursor (); + bool do_remove_location_at_playhead_cursor (); void remove_location_at_playhead_cursor (); bool select_new_marker; @@ -1651,6 +1667,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void edit_meter_marker (MeterMarker&); void edit_control_point (ArdourCanvas::Item*); void edit_notes (MidiRegionView*); + void edit_region (RegionView*); + + void edit_current_meter (); + void edit_current_tempo (); void marker_menu_edit (); void marker_menu_remove (); @@ -1680,7 +1700,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); - void build_range_marker_menu (bool, bool); + void build_range_marker_menu (ARDOUR::Location *, bool, bool); void build_marker_menu (ARDOUR::Location *); void build_tempo_marker_menu (TempoMarker *, bool); void build_meter_marker_menu (MeterMarker *, bool); @@ -1708,7 +1728,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void compute_current_bbt_points (std::vector& grid, framepos_t left, framepos_t right); void tempo_map_changed (const PBD::PropertyChange&); - void marker_position_changed (); + void tempometric_position_changed (const PBD::PropertyChange&); void redisplay_tempo (bool immediate_redraw); uint32_t bbt_beat_subdivision; @@ -1797,6 +1817,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Glib::RefPtr zoom_focus_action (Editing::ZoomFocus); + Gtk::HBox _track_box; + Gtk::HBox _zoom_box; void zoom_adjustment_changed(); @@ -1805,12 +1827,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void setup_tooltips (); Gtk::HBox toolbar_hbox; - Gtk::EventBox toolbar_base; - Gtk::Frame toolbar_frame; - Gtk::Viewport _toolbar_viewport; void setup_midi_toolbar (); + void presentation_info_changed (PBD::PropertyChange const &); + /* selection process */ Selection* selection; @@ -1834,8 +1855,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void point_selection_changed (); void marker_selection_changed (); - bool _ignore_follow_edits; - void cancel_selection (); void cancel_time_selection (); @@ -1997,6 +2016,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* duplication */ void duplicate_range (bool with_dialog); + void duplicate_regions (float times); /** computes the timeline frame (sample) of an event whose coordinates * are in canvas units (pixels, scroll offset included). @@ -2202,8 +2222,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD bool _region_selection_change_updates_region_list; void setup_fade_images (); - std::map _fade_in_images; - std::map _fade_out_images; std::map _xfade_in_images; std::map _xfade_out_images; @@ -2250,6 +2268,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtkmm2ext::ActionMap myactions; friend class Drag; + friend class RegionCutDrag; friend class RegionDrag; friend class RegionMoveDrag; friend class RegionSpliceDrag; @@ -2266,6 +2285,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD friend class ControlPointDrag; friend class LineDrag; friend class RubberbandSelectDrag; + friend class RulerZoomDrag; friend class EditorRubberbandSelectDrag; friend class TimeFXDrag; friend class ScrubDrag;