X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=63a19e0d3eb83bae62a7109737e8d73357187f41;hb=523952e655d27f0ff6e5f2eff0f272fc5aca6fa5;hp=e68d425397c28f7460ba51c107914438d2399d0c;hpb=62941af2cf8da4c5424afb9173fdb310c2c23eef;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index e68d425397..63a19e0d3e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -45,8 +45,8 @@ #include #include -#include #include +#include #include #include @@ -134,6 +134,8 @@ class Editor : public PublicEditor return (nframes_t) floor (canvas_width * frames_per_unit); } + void cycle_snap_mode (); + void cycle_snap_choice (); void set_snap_to (Editing::SnapType); void set_snap_mode (Editing::SnapMode); void set_snap_threshold (double pixel_distance) {snap_threshold = pixel_distance;} @@ -169,6 +171,7 @@ class Editor : public PublicEditor /* things that need to be public to be used in the main menubar */ void new_region_from_selection (); + void separate_regions_between (const TimeSelection&); void separate_region_from_selection (); void separate_regions_using_location (ARDOUR::Location&); void toggle_playback (bool with_abort); @@ -214,6 +217,8 @@ class Editor : public PublicEditor return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit))); } + void flush_canvas (); + /* selection */ Selection& get_selection() const { return *selection; } @@ -226,6 +231,7 @@ class Editor : public PublicEditor void select_all (Selection::Operation op); void invert_selection_in_track (); void invert_selection (); + void deselect_all (); /* tempo */ @@ -251,7 +257,7 @@ class Editor : public PublicEditor void set_zoom_focus (Editing::ZoomFocus); Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; } - gdouble get_current_zoom () { return frames_per_unit; } + double get_current_zoom () const { return frames_per_unit; } void temporal_zoom_step (bool coarser); @@ -259,8 +265,6 @@ class Editor : public PublicEditor PlaylistSelector& playlist_selector() const; void route_name_changed (TimeAxisView *); - gdouble frames_per_unit; - nframes_t leftmost_frame; void clear_playlist (boost::shared_ptr); void new_playlists (TimeAxisView*); @@ -344,8 +348,7 @@ class Editor : public PublicEditor void reset_zoom (double); void reposition_and_zoom (nframes_t, double); - nframes_t edit_cursor_position(bool); - nframes64_t get_preferred_edit_position () const; + nframes64_t get_preferred_edit_position (); bool update_mouse_speed (); bool decelerate_mouse_speed (); @@ -366,7 +369,22 @@ class Editor : public PublicEditor PlaylistSelector* _playlist_selector; - void set_frames_per_unit (double); + struct VisualState { + double frames_per_unit; + nframes_t leftmost_frame; + Editing::ZoomFocus zoom_focus; + }; + + VisualState last_visual_state; + + nframes_t leftmost_frame; + double frames_per_unit; + Editing::ZoomFocus zoom_focus; + + void use_visual_state (const VisualState&); + void set_frames_per_unit (double); + void swap_visual_state (); + void post_zoom (); Editing::MouseMode mouse_mode; @@ -394,6 +412,7 @@ class Editor : public PublicEditor void location_gone (ARDOUR::Location *); void remove_marker (ArdourCanvas::Item&, GdkEvent*); gint really_remove_marker (ARDOUR::Location* loc); + void goto_nth_marker (int nth); uint32_t location_marker_color; uint32_t location_range_color; @@ -404,7 +423,10 @@ class Editor : public PublicEditor struct LocationMarkers { Marker* start; Marker* end; + bool valid; + LocationMarkers () : start(0), end(0), valid (true) {} + ~LocationMarkers (); void hide(); @@ -416,18 +438,21 @@ class Editor : public PublicEditor LocationMarkers *find_location_markers (ARDOUR::Location *) const; ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start) const; + Marker* entered_marker; typedef std::map LocationMarkerMap; LocationMarkerMap location_markers; void hide_marker (ArdourCanvas::Item*, GdkEvent*); void clear_marker_display (); - void mouse_add_new_marker (nframes_t where); + void mouse_add_new_marker (nframes_t where, bool is_cd=false); + void update_cd_marker_display (); + void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location); TimeAxisView* clicked_trackview; AudioTimeAxisView* clicked_audio_trackview; RegionView* clicked_regionview; - RegionView* latest_regionview; + RegionSelection latest_regionviews; uint32_t clicked_selection; CrossfadeView* clicked_crossfadeview; ControlPoint* clicked_control_point; @@ -452,11 +477,12 @@ class Editor : public PublicEditor void catch_vanishing_regionview (RegionView *); - bool set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false); + void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false); void select_all_tracks (); bool set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool no_remove=false); - bool set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false); + void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false); + void set_selected_track_as_side_effect (bool force = false); bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set, bool no_track_remove=false); void set_selected_regionview_from_region_list (boost::shared_ptr region, Selection::Operation op = Selection::Set); @@ -529,6 +555,7 @@ class Editor : public PublicEditor ArdourCanvas::Group* marker_group; ArdourCanvas::Group* range_marker_group; ArdourCanvas::Group* transport_marker_group; + ArdourCanvas::Group* cd_marker_group; enum { ruler_metric_smpte = 0, @@ -541,10 +568,11 @@ class Editor : public PublicEditor ruler_time_marker = 6, ruler_time_range_marker = 7, ruler_time_transport_marker = 8, + ruler_time_cd_marker = 9, }; static GtkCustomMetric ruler_metrics[4]; - bool ruler_shown[9]; + bool ruler_shown[10]; bool no_ruler_shown_update; gint ruler_button_press (GdkEventButton*); @@ -595,6 +623,7 @@ class Editor : public PublicEditor ArdourCanvas::SimpleRect* marker_bar; ArdourCanvas::SimpleRect* range_marker_bar; ArdourCanvas::SimpleRect* transport_marker_bar; + ArdourCanvas::SimpleRect* cd_marker_bar; ArdourCanvas::SimpleLine* tempo_line; @@ -602,6 +631,7 @@ class Editor : public PublicEditor ArdourCanvas::SimpleLine* marker_line; ArdourCanvas::SimpleLine* range_marker_line; ArdourCanvas::SimpleLine* transport_marker_line; + ArdourCanvas::SimpleLine* cd_marker_line; Gtk::Label minsec_label; Gtk::Label bbt_label; @@ -612,6 +642,7 @@ class Editor : public PublicEditor Gtk::Label mark_label; Gtk::Label range_mark_label; Gtk::Label transport_mark_label; + Gtk::Label cd_mark_label; Gtk::VBox time_button_vbox; @@ -637,18 +668,33 @@ class Editor : public PublicEditor */ Cursor* playhead_cursor; - Cursor* edit_cursor; ArdourCanvas::Group* cursor_group; + void cursor_to_region_boundary (Cursor*, int32_t dir); + void cursor_to_next_region_boundary (Cursor*); + void cursor_to_previous_region_boundary (Cursor*); void cursor_to_next_region_point (Cursor*, ARDOUR::RegionPoint); void cursor_to_previous_region_point (Cursor*, ARDOUR::RegionPoint); void cursor_to_region_point (Cursor*, ARDOUR::RegionPoint, int32_t dir); void cursor_to_selection_start (Cursor *); void cursor_to_selection_end (Cursor *); + + void selected_marker_to_region_boundary (int32_t dir); + void selected_marker_to_next_region_boundary (); + void selected_marker_to_previous_region_boundary (); + void selected_marker_to_next_region_point (ARDOUR::RegionPoint); + void selected_marker_to_previous_region_point (ARDOUR::RegionPoint); + void selected_marker_to_region_point (ARDOUR::RegionPoint, int32_t dir); + void selected_marker_to_selection_start (); + void selected_marker_to_selection_end (); + void select_all_selectables_using_cursor (Cursor *, bool); - void select_all_selectables_between_cursors (Cursor *, Cursor *); + void select_all_selectables_using_edit (bool); + void select_all_selectables_between (bool within); + void select_range_between (); boost::shared_ptr find_next_region (nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0); + nframes64_t find_next_region_boundary (nframes64_t, int32_t dir, const TrackViewList&); vector region_boundary_cache; void build_region_boundary_cache (); @@ -740,13 +786,15 @@ class Editor : public PublicEditor RegionListDisplayModelColumns region_list_columns; Gtkmm2ext::DnDTreeView > region_list_display; - + Glib::RefPtr region_list_model; Glib::RefPtr toggle_full_region_list_action; Glib::RefPtr toggle_show_auto_regions_action; void region_list_selection_changed (); bool region_list_selection_filter (const Glib::RefPtr& model, const Gtk::TreeModel::Path& path, bool yn); + void region_name_edit (const Glib::ustring&, const Glib::ustring&); + void get_regions_corresponding_to (boost::shared_ptr region, std::vector& regions); Gtk::Menu *region_list_menu; Gtk::ScrolledWindow region_list_scroller; @@ -839,6 +887,7 @@ class Editor : public PublicEditor static Gdk::Cursor* speaker_cursor; static Gdk::Cursor* wait_cursor; static Gdk::Cursor* timebar_cursor; + static Gdk::Cursor* transparent_cursor; static void build_cursors (); @@ -898,16 +947,18 @@ class Editor : public PublicEditor void split_region_at (nframes_t); void split_regions_at (nframes_t, RegionSelection&); void crop_region_to_selection (); - void set_a_regions_sync_position (boost::shared_ptr, nframes_t); - void set_region_sync_from_edit_cursor (); + void crop_region_to (nframes_t start, nframes_t end); + void set_sync_point (nframes64_t, const RegionSelection&); + void set_region_sync_from_edit_point (); void remove_region_sync(); - void align_selection (ARDOUR::RegionPoint, nframes_t position); - void align_selection_relative (ARDOUR::RegionPoint point, nframes_t position); + void align_selection (ARDOUR::RegionPoint, nframes_t position, const RegionSelection&); + void align_selection_relative (ARDOUR::RegionPoint point, nframes_t position, const RegionSelection&); void align_region (boost::shared_ptr, ARDOUR::RegionPoint point, nframes_t position); void align_region_internal (boost::shared_ptr, ARDOUR::RegionPoint point, nframes_t position); void remove_clicked_region (); void destroy_clicked_region (); void edit_region (); + void rename_region (); void duplicate_some_regions (RegionSelection&, float times); void duplicate_selection (float times); void region_fill_selection (); @@ -930,6 +981,8 @@ class Editor : public PublicEditor void reset_focus (); + void split (); + void cut (); void copy (); void paste (float times); @@ -937,28 +990,21 @@ class Editor : public PublicEditor int get_prefix (float&, bool&); void keyboard_paste (); - void keyboard_duplicate_region (); - void keyboard_duplicate_selection (); void keyboard_insert_region_list_selection (); void region_from_selection (); void create_region_from_selection (std::vector >&); - bool region_renamed; - void rename_region (); - void rename_region_finished (bool); - void play_from_start (); - void play_from_edit_cursor (); + void play_from_edit_point (); void play_selected_region (); void audition_selected_region (); void loop_selected_region (); void play_location (ARDOUR::Location&); void loop_location (ARDOUR::Location&); - Editing::ZoomFocus zoom_focus; - void temporal_zoom_selection (); + void temporal_zoom_region (); void temporal_zoom_session (); void temporal_zoom (gdouble scale); void temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op); @@ -1028,7 +1074,7 @@ class Editor : public PublicEditor void move_to_end (); void goto_frame (); void center_playhead (); - void center_edit_cursor (); + void center_edit_point (); void edit_cursor_backward (); void edit_cursor_forward (); void playhead_backward (); @@ -1062,15 +1108,21 @@ class Editor : public PublicEditor void set_selection_from_loop (); void set_selection_from_audio_region (); + void add_location_mark (nframes64_t where); void add_location_from_audio_region (); void add_location_from_selection (); void set_loop_from_selection (bool play); void set_punch_from_selection (); + void set_loop_from_edit_range (bool play); + void set_loop_from_region (bool play); + void set_punch_from_edit_range (); + void set_loop_range (nframes_t start, nframes_t end, std::string cmd); void set_punch_range (nframes_t start, nframes_t end, std::string cmd); void add_location_from_playhead_cursor (); + bool select_new_marker; void reverse_selection (); void edit_envelope (); @@ -1081,6 +1133,8 @@ class Editor : public PublicEditor bool _scrubbing; double last_scrub_x; int scrubbing_direction; + int scrub_reversals; + int scrub_reverse_distance; void keyboard_selection_begin (); void keyboard_selection_finish (bool add); @@ -1118,15 +1172,23 @@ class Editor : public PublicEditor void set_fade_in_shape (ARDOUR::AudioRegion::FadeShape); void set_fade_out_shape (ARDOUR::AudioRegion::FadeShape); - + + void set_fade_length (bool in); + void toggle_fade_active (bool in); void set_fade_in_active (bool); void set_fade_out_active (bool); std::set > motion_frozen_playlists; + RegionSelection pre_drag_region_selection; void region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); void region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + bool check_region_drag_possible (AudioTimeAxisView**); + void possibly_copy_regions_during_grab (GdkEvent*); + void region_drag_splice_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void region_drag_splice_finished_callback (ArdourCanvas::Item*, GdkEvent*); bool _dragging_playhead; + bool _dragging_edit_point; void cursor_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); void cursor_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); @@ -1197,6 +1259,7 @@ class Editor : public PublicEditor bool canvas_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_cd_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*); @@ -1210,7 +1273,6 @@ class Editor : public PublicEditor /* non-public event handlers */ bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*); - bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*); bool track_canvas_scroll (GdkEventScroll* event); bool track_canvas_scroll_event (GdkEventScroll* event); @@ -1223,24 +1285,13 @@ class Editor : public PublicEditor void track_canvas_allocate (Gtk::Allocation alloc); bool track_canvas_size_allocated (); - void set_edit_cursor (GdkEvent* event); - void set_playhead_cursor (GdkEvent* event); + void set_playhead_cursor (); void kbd_driver (sigc::slot, bool use_track_canvas = true, bool use_time_canvas = true, bool can_select = true); - void kbd_set_playhead_cursor (); - void kbd_set_edit_cursor (); void kbd_mute_unmute_region (); - void kbd_split (); - void kbd_set_sync_position (); - void kbd_align (ARDOUR::RegionPoint); - void kbd_align_relative (ARDOUR::RegionPoint); void kbd_brush (); void kbd_audition (); - void kbd_do_split (GdkEvent*); - void kbd_do_set_sync_position (GdkEvent* ev); - void kbd_do_align (GdkEvent*, ARDOUR::RegionPoint); - void kbd_do_align_relative (GdkEvent*, ARDOUR::RegionPoint); void kbd_do_brush (GdkEvent*); void kbd_do_audition (GdkEvent*); @@ -1285,6 +1336,7 @@ class Editor : public PublicEditor void marker_menu_edit (); void marker_menu_remove (); void marker_menu_rename (); + void marker_menu_lock (bool yn); void marker_menu_hide (); void marker_menu_loop_range (); void marker_menu_select_all_selectables_using_range (); @@ -1315,6 +1367,7 @@ class Editor : public PublicEditor Gtk::Menu* range_marker_menu; Gtk::Menu* transport_marker_menu; Gtk::Menu* new_transport_marker_menu; + Gtk::Menu* cd_marker_menu; ArdourCanvas::Item* marker_menu_item; typedef list Marks; @@ -1342,7 +1395,7 @@ class Editor : public PublicEditor void editor_mixer_button_toggled (); - AudioClock edit_cursor_clock; + AudioClock edit_point_clock; AudioClock zoom_range_clock; Gtk::Button zoom_in_button; Gtk::Button zoom_out_button; @@ -1375,6 +1428,8 @@ class Editor : public PublicEditor Gtk::ComboBoxText edit_mode_selector; Gtk::VBox edit_mode_box; + void set_edit_mode (ARDOUR::EditMode); + void cycle_edit_mode (); void edit_mode_selection_done (); Gtk::ComboBoxText snap_type_selector; @@ -1406,7 +1461,7 @@ class Editor : public PublicEditor void zoom_adjustment_changed(); - void edit_cursor_clock_changed(); + void edit_point_clock_changed(); void setup_toolbar (); @@ -1447,7 +1502,8 @@ class Editor : public PublicEditor /* transport range select process */ enum RangeMarkerOp { CreateRangeMarker, - CreateTransportMarker + CreateTransportMarker, + CreateCDMarker } range_marker_op; void start_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event, RangeMarkerOp); @@ -1617,9 +1673,16 @@ class Editor : public PublicEditor void trim_finished_callback (ArdourCanvas::Item*, GdkEvent*); void thaw_region_after_trim (RegionView& rv); - - void trim_region_to_edit_cursor (); - void trim_region_from_edit_cursor (); + + void trim_region_front(); + void trim_region_back(); + void trim_region (bool front); + + void trim_region_to_edit_point (); + void trim_region_from_edit_point (); + void trim_region_to_loop (); + void trim_region_to_punch (); + void trim_region_to_location (const ARDOUR::Location&, const char* cmd); bool show_gain_after_trim; @@ -1731,7 +1794,7 @@ class Editor : public PublicEditor /* duplication */ - void duplicate_dialog (bool for_region); + void duplicate_dialog (bool with_dialog); nframes64_t event_frame (GdkEvent*, double* px = 0, double* py = 0) const; @@ -1789,7 +1852,7 @@ class Editor : public PublicEditor /* nudging tracks */ - void nudge_track (bool use_edit_cursor, bool forwards); + void nudge_track (bool use_edit_point, bool forwards); /* xfades */ @@ -1874,6 +1937,8 @@ class Editor : public PublicEditor TimeAxisView* entered_track; RegionView* entered_regionview; + void ensure_entered_region_selected (bool op_acts_on_objects = false); + void ensure_entered_track_selected (bool op_acts_on_objects = false); bool clear_entered_track; gint left_track_canvas (GdkEventCrossing*); void set_entered_track (TimeAxisView*); @@ -1893,6 +1958,7 @@ class Editor : public PublicEditor Gtk::CheckMenuItem* region_opaque_item; bool on_key_press_event (GdkEventKey*); + bool on_key_release_event (GdkEventKey*); void session_state_saved (string); @@ -1908,11 +1974,36 @@ class Editor : public PublicEditor Gtk::ComboBoxText edit_point_selector; - void set_edit_point (Editing::EditPoint ep); + void set_edit_point_preference (Editing::EditPoint ep); + void cycle_edit_point (bool with_marker); + void set_edit_point (); void edit_point_selection_done (); void edit_point_chosen (Editing::EditPoint); Glib::RefPtr edit_point_action (Editing::EditPoint); std::vector edit_point_strings; + + void selected_marker_moved (ARDOUR::Location*); + sigc::connection edit_point_clock_connection_a; + sigc::connection edit_point_clock_connection_b; + + bool get_edit_op_range (nframes64_t& start, nframes64_t& end) const; + + RegionSelection get_regions_at (nframes64_t where, const TrackSelection& ts) const; + RegionSelection get_regions_after (nframes64_t where, const TrackSelection& ts) const; + + RegionSelection tmp_regions; + + RegionSelection& get_regions_for_action (); + + sigc::connection fast_screen_update_connection; + gint start_updating (); + gint stop_updating (); + void toggle_meter_updating(); + void fast_update_strips (); + bool meters_running; + + void select_next_route (); + void select_prev_route (); }; #endif /* __ardour_editor_h__ */