X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=63a19e0d3eb83bae62a7109737e8d73357187f41;hb=523952e655d27f0ff6e5f2eff0f272fc5aca6fa5;hp=10747735b58bafa98360819309aee3376cf39765;hpb=d4eacffb26a3198a278ed92a0fa556fe1a31d757;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 10747735b5..63a19e0d3e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_editor_h__ @@ -26,10 +25,14 @@ #include #include #include +#include + +#include #include #include #include +#include #include @@ -43,8 +46,9 @@ #include #include #include +#include #include -#include +#include #include "audio_clock.h" #include "gtk-custom-ruler.h" @@ -61,10 +65,6 @@ namespace Gtkmm2ext { class TearOff; } -namespace LinuxAudioSystems { - class AudioEngine; -} - namespace ARDOUR { class AudioDiskstream; class RouteGroup; @@ -104,6 +104,7 @@ class MixerStrip; class StreamView; class AudioStreamView; class ControlPoint; +class SoundFileOmega; #ifdef FFT_ANALYSIS class AnalysisWindow; #endif @@ -122,7 +123,7 @@ class TimeAxisViewItem ; class Editor : public PublicEditor { public: - Editor (ARDOUR::AudioEngine&); + Editor (); ~Editor (); void connect_to_session (ARDOUR::Session *); @@ -133,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;} @@ -147,11 +150,11 @@ class Editor : public PublicEditor void step_mouse_mode (bool next); Editing::MouseMode current_mouse_mode () { return mouse_mode; } - void add_imageframe_time_axis(const string & track_name, void*) ; - void add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void*) ; + void add_imageframe_time_axis(const std::string & track_name, void*) ; + void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) ; void connect_to_image_compositor() ; void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ; - TimeAxisView* get_named_time_axis(const string & name) ; + TimeAxisView* get_named_time_axis(const std::string & name) ; void consider_auditioning (boost::shared_ptr); void hide_a_region (boost::shared_ptr); @@ -168,23 +171,23 @@ 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); + void transition_to_rolling (bool forward); /* undo related */ - void set_edit_menu (Gtk::Menu&); - - nframes_t unit_to_frame (double unit) { + nframes_t unit_to_frame (double unit) const { return (nframes_t) rint (unit * frames_per_unit); } - double frame_to_unit (nframes_t frame) { + double frame_to_unit (nframes_t frame) const { return rint ((double) frame / (double) frames_per_unit); } - double frame_to_unit (double frame) { + double frame_to_unit (double frame) const { return rint (frame / frames_per_unit); } @@ -195,7 +198,7 @@ class Editor : public PublicEditor xscroll_adjustment. */ - nframes_t pixel_to_frame (double pixel) { + nframes64_t pixel_to_frame (double pixel) const { /* pixel can be less than zero when motion events are processed. since we've already run the world->canvas @@ -210,20 +213,25 @@ class Editor : public PublicEditor } } - gulong frame_to_pixel (nframes_t frame) { + gulong frame_to_pixel (nframes64_t frame) const { 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; } Selection& get_cut_buffer() const { return *cut_buffer; } + bool extend_selection_to_track (TimeAxisView&); + void play_selection (); void select_all_in_track (Selection::Operation op); void select_all (Selection::Operation op); void invert_selection_in_track (); void invert_selection (); + void deselect_all (); /* tempo */ @@ -244,12 +252,12 @@ class Editor : public PublicEditor void export_session(); void export_selection(); - void add_toplevel_controls (Gtk::Container&); + Gtk::HBox& get_status_bar_packer() { return status_bar_hpacker; } 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); @@ -257,17 +265,16 @@ class Editor : public PublicEditor PlaylistSelector& playlist_selector() const; void route_name_changed (TimeAxisView *); - gdouble frames_per_unit; - nframes_t leftmost_frame; - void clear_playlist (ARDOUR::Playlist&); + void clear_playlist (boost::shared_ptr); - void new_playlists (); - void copy_playlists (); - void clear_playlists (); + void new_playlists (TimeAxisView*); + void copy_playlists (TimeAxisView*); + void clear_playlists (TimeAxisView*); TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0); Width editor_mixer_strip_width; + void maybe_add_mixer_strip_width (XMLNode&); void show_editor_mixer (bool yn); void set_selected_mixer_strip (TimeAxisView&); void hide_track_in_display (TimeAxisView& tv); @@ -288,25 +295,29 @@ class Editor : public PublicEditor void set_follow_playhead (bool yn); void toggle_follow_playhead (); bool follow_playhead() const { return _follow_playhead; } + bool dragging_playhead () const { return _dragging_playhead; } void toggle_waveform_visibility (); void toggle_waveforms_while_recording (); void toggle_measure_visibility (); + void toggle_logo_visibility (); /* SMPTE timecode & video sync */ - void smpte_fps_chosen (ARDOUR::Session::SmpteFormat format); + void smpte_fps_chosen (ARDOUR::SmpteFormat format); void video_pullup_chosen (ARDOUR::Session::PullupFormat pullup); + void subframes_per_frame_chosen (uint32_t); void update_smpte_mode(); void update_video_pullup(); - + void update_subframes_per_frame (); /* xfades */ void toggle_auto_xfade (); void toggle_xfades_active (); void toggle_xfade_visibility (); bool xfade_visibility() const { return _xfade_visibility; } + void update_xfade_visibility (); void update_crossfade_model (); void set_crossfade_model (ARDOUR::CrossfadeModel); @@ -330,11 +341,18 @@ class Editor : public PublicEditor bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; } void prepare_for_cleanup (); - void reposition_x_origin (nframes_t sample); - void maximise_editing_space(); void restore_editing_space(); + void reset_x_origin (nframes_t); + void reset_zoom (double); + void reposition_and_zoom (nframes_t, double); + + nframes64_t get_preferred_edit_position (); + + bool update_mouse_speed (); + bool decelerate_mouse_speed (); + protected: void map_transport_state (); void map_position_change (nframes_t); @@ -344,16 +362,36 @@ class Editor : public PublicEditor private: ARDOUR::Session *session; - ARDOUR::AudioEngine& engine; bool constructed; + + // to keep track of the playhead position for control_scroll + boost::optional _control_scroll_target; 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; + int post_maximal_editor_width; + int post_maximal_pane_position; int pre_maximal_pane_position; + int pre_maximal_editor_width; void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); Gtk::Notebook the_notebook; @@ -374,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; @@ -384,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(); @@ -394,30 +436,36 @@ class Editor : public PublicEditor void set_color_rgba (uint32_t); }; - LocationMarkers *find_location_markers (ARDOUR::Location *); - ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start); + 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; - void get_relevant_audio_tracks (AudioTimeAxisView& base, std::set& relevant_tracks); - void mapover_audio_tracks (sigc::slot sl); + void sort_track_selection (); + + void get_relevant_audio_tracks (std::set& relevant_tracks); + void get_equivalent_regions (RegionView* rv, std::vector&); + void mapover_audio_tracks (sigc::slot sl, TimeAxisView*); /* functions to be passed to mapover_audio_tracks(), possibly with sigc::bind()-supplied arguments */ - void mapped_set_selected_regionview_from_click (RouteTimeAxisView&, uint32_t, RegionView*, vector*); + void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector*); void mapped_use_new_playlist (AudioTimeAxisView&, uint32_t); void mapped_use_copy_playlist (AudioTimeAxisView&, uint32_t); void mapped_clear_playlist (AudioTimeAxisView&, uint32_t); @@ -429,10 +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 (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); @@ -459,7 +509,7 @@ class Editor : public PublicEditor void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&); void add_bus_context_items (Gtk::Menu_Helpers::MenuList&); void add_region_context_items (AudioStreamView*, boost::shared_ptr, Gtk::Menu_Helpers::MenuList&); - void add_crossfade_context_items (AudioStreamView*, ARDOUR::Crossfade*, Gtk::Menu_Helpers::MenuList&, bool many); + void add_crossfade_context_items (AudioStreamView*, boost::shared_ptr, Gtk::Menu_Helpers::MenuList&, bool many); void add_selection_context_items (Gtk::Menu_Helpers::MenuList&); void handle_new_route (ARDOUR::Session::RouteList&); @@ -493,16 +543,19 @@ class Editor : public PublicEditor Gtk::EventBox time_canvas_event_box; Gtk::EventBox track_canvas_event_box; Gtk::EventBox time_button_event_box; - - ArdourCanvas::Group *minsec_group; - ArdourCanvas::Group *bbt_group; - ArdourCanvas::Group *smpte_group; - ArdourCanvas::Group *frame_group; - ArdourCanvas::Group *tempo_group; - ArdourCanvas::Group *meter_group; - ArdourCanvas::Group *marker_group; - ArdourCanvas::Group *range_marker_group; - ArdourCanvas::Group *transport_marker_group; + Gtk::Frame time_button_frame; + + ArdourCanvas::Pixbuf* logo_item; + ArdourCanvas::Group* minsec_group; + ArdourCanvas::Group* bbt_group; + ArdourCanvas::Group* smpte_group; + ArdourCanvas::Group* frame_group; + ArdourCanvas::Group* tempo_group; + ArdourCanvas::Group* meter_group; + ArdourCanvas::Group* marker_group; + ArdourCanvas::Group* range_marker_group; + ArdourCanvas::Group* transport_marker_group; + ArdourCanvas::Group* cd_marker_group; enum { ruler_metric_smpte = 0, @@ -515,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*); @@ -549,6 +603,7 @@ class Editor : public PublicEditor gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); + Gtk::Widget *_ruler_separator; GtkWidget *_smpte_ruler; GtkWidget *_bbt_ruler; GtkWidget *_frames_ruler; @@ -568,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; @@ -575,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; @@ -585,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; @@ -597,7 +655,7 @@ class Editor : public PublicEditor nframes_t current_frame; double length; - Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); + Cursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); ~Cursor (); void set_position (nframes_t); @@ -610,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 (); @@ -642,6 +715,7 @@ class Editor : public PublicEditor void controls_layout_size_request (Gtk::Requisition*); Gtk::HScrollbar edit_hscrollbar; + bool _dragging_hscrollbar; void reset_hscrollbar_stepping (); @@ -651,6 +725,7 @@ class Editor : public PublicEditor double canvas_width; double canvas_height; + double full_canvas_height; nframes_t last_canvas_frame; bool track_canvas_map_handler (GdkEventAny*); @@ -672,10 +747,31 @@ class Editor : public PublicEditor void tie_vertical_scrolling (); void canvas_horizontally_scrolled (); - void reposition_and_zoom (nframes_t sample, double fpu); - gint deferred_reposition_and_zoom (nframes_t sample, double fpu); + struct VisualChange { + enum Type { + TimeOrigin = 0x1, + ZoomLevel = 0x2 + }; + + Type pending; + nframes_t time_origin; + double frames_per_unit; + + int idle_handler_id; + + VisualChange() : pending ((VisualChange::Type) 0), time_origin (0), frames_per_unit (0), idle_handler_id (-1) {} + }; + + + VisualChange pending_visual_change; + + static int _idle_visual_changer (void *arg); + int idle_visual_changer (); + + void queue_visual_change (nframes_t); + void queue_visual_change (double); + void end_location_changed (ARDOUR::Location*); - bool repos_zoom_queued; struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { RegionListDisplayModelColumns() { @@ -690,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; @@ -737,10 +835,12 @@ class Editor : public PublicEditor SnapshotDisplayModelColumns snapshot_display_columns; Glib::RefPtr snapshot_display_model; Gtk::TreeView snapshot_display; + Gtk::Menu snapshot_context_menu; bool snapshot_display_button_press (GdkEventButton*); void snapshot_display_selection_changed (); void redisplay_snapshots(); + void popup_snapshot_context_menu (int, int32_t, Glib::ustring); /* named selections */ @@ -759,20 +859,21 @@ class Editor : public PublicEditor Gtkmm2ext::DnDTreeView named_selection_display; Gtk::ScrolledWindow named_selection_scroller; - void name_selection(); - void named_selection_name_chosen (); - void create_named_selection (const string &); + void create_named_selection (); void paste_named_selection (float times); + void remove_selected_named_selections (); + void remove_snapshot (Glib::ustring); + void rename_snapshot (Glib::ustring); void handle_new_named_selection (); void add_named_selection_to_named_selection_display (ARDOUR::NamedSelection&); void redisplay_named_selections (); - gint named_selection_display_button_press (GdkEventButton *ev); + bool named_selection_display_button_release (GdkEventButton *ev); + bool named_selection_display_key_release (GdkEventKey *ev); void named_selection_display_selection_changed (); /* track views */ - int track_spacing; TrackViewList track_views; TimeAxisView *trackview_by_y_position (double ypos); @@ -786,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 (); @@ -814,8 +916,8 @@ class Editor : public PublicEditor int ensure_cursor (nframes_t* pos); - void handle_new_audio_region (boost::shared_ptr); - void handle_audio_region_removed (boost::shared_ptr); + void handle_new_audio_region (boost::weak_ptr); + void handle_audio_region_removed (boost::weak_ptr); void add_audio_region_to_region_display (boost::shared_ptr); void region_hidden (boost::shared_ptr); void redisplay_regions (); @@ -835,6 +937,7 @@ class Editor : public PublicEditor void reset_point_selection (); void toggle_region_mute (); + void toggle_region_lock (); void toggle_region_opaque (); void raise_region (); void raise_region_to_top (); @@ -844,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 (); @@ -874,6 +979,10 @@ class Editor : public PublicEditor void align_relative (ARDOUR::RegionPoint); void naturalize (); + void reset_focus (); + + void split (); + void cut (); void copy (); void paste (float times); @@ -881,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); @@ -915,14 +1017,29 @@ class Editor : public PublicEditor void insert_region_list_selection (float times); void add_external_audio_action (Editing::ImportMode); + void external_audio_dialog (); + bool check_multichannel_status (const std::vector& paths); + + SoundFileOmega* sfbrowser; + + void bring_in_external_audio (Editing::ImportMode mode, nframes64_t& pos); + void do_import (vector paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&); - void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t& pos, bool prompt); - void do_import (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); - void do_embed (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); - int import_sndfile (Glib::ustring path, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos); - int embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, - ARDOUR::AudioTrack* track, nframes_t& pos, bool prompt); - int finish_bringing_in_audio (boost::shared_ptr region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, nframes_t& pos, Editing::ImportMode mode); + void _do_embed (vector paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&); + void do_embed (vector paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&); + bool idle_do_embed (vector paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&); + + int import_sndfiles (vector paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos, + int target_regions, int target_tracks, boost::shared_ptr&); + int embed_sndfiles (vector paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr&); + + int add_sources (vector paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode, + int target_regions, int target_tracks, boost::shared_ptr&, bool add_channel_suffix); + int finish_bringing_in_audio (boost::shared_ptr region, uint32_t, uint32_t, nframes64_t& pos, Editing::ImportMode mode, + boost::shared_ptr& existing_track); + + boost::shared_ptr get_nth_selected_audio_track (int nth) const; /* generic interthread progress window */ @@ -951,17 +1068,18 @@ class Editor : public PublicEditor /* to support this ... */ void import_audio (bool as_tracks); - void do_import (vector paths, bool split, bool as_tracks); + void do_import (vector paths, bool split, bool as_tracks); void move_to_start (); 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 (); void playhead_forward (); + void scroll_playhead (bool forward); void scroll_backward (float pages=0.8f); void scroll_forward (float pages=0.8f); void scroll_tracks_down (); @@ -975,6 +1093,8 @@ class Editor : public PublicEditor void clear_markers (); void clear_ranges (); 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); @@ -988,11 +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_route_loop_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 (); @@ -1000,6 +1130,12 @@ class Editor : public PublicEditor void start_scrolling (); void stop_scrolling (); + 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); bool have_pending_keyboard_selection; @@ -1033,10 +1169,26 @@ class Editor : public PublicEditor void fade_out_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); void fade_in_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); void fade_out_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + + 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; + 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*); @@ -1107,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*); @@ -1120,30 +1273,25 @@ 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_event (GdkEvent* event, ArdourCanvas::Item*); bool track_canvas_scroll (GdkEventScroll* event); + bool track_canvas_scroll_event (GdkEventScroll* event); + bool track_canvas_button_press_event (GdkEventButton* event); + bool track_canvas_button_release_event (GdkEventButton* event); + bool track_canvas_motion_notify_event (GdkEventMotion* event); + + Gtk::Allocation canvas_allocation; + bool canvas_idle_queued; 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*); @@ -1188,11 +1336,14 @@ 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 (); + void marker_menu_select_using_range (); void marker_menu_separate_regions_using_location (); void marker_menu_play_from (); + void marker_menu_play_range (); void marker_menu_set_playhead (); void marker_menu_set_from_playhead (); void marker_menu_set_from_selection (); @@ -1205,17 +1356,18 @@ class Editor : public PublicEditor void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); - void build_range_marker_menu (); - void build_marker_menu (); + void build_range_marker_menu (bool loop_or_punch); + void build_marker_menu (bool start_or_end); void build_tm_marker_menu (); - void build_transport_marker_menu (); void build_new_transport_marker_menu (); Gtk::Menu* tm_marker_menu; Gtk::Menu* marker_menu; + Gtk::Menu* start_end_marker_menu; 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; @@ -1225,9 +1377,16 @@ class Editor : public PublicEditor void draw_metric_marks (const ARDOUR::Metrics& metrics); void tempo_map_changed (ARDOUR::Change); - void redisplay_tempo (); + void redisplay_tempo (bool immediate_redraw); - void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false); + void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false); + void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false) { + /* XXX remove this function when everything moves to 64 bit frame counts */ + nframes64_t first64 = first; + snap_to (first64, direction, for_mark); + first = (nframes_t) first64; + } + uint32_t bbt_beat_subdivision; /* toolbar */ @@ -1236,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; @@ -1269,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; @@ -1300,7 +1461,7 @@ class Editor : public PublicEditor void zoom_adjustment_changed(); - void edit_cursor_clock_changed(); + void edit_point_clock_changed(); void setup_toolbar (); @@ -1318,6 +1479,7 @@ class Editor : public PublicEditor void track_selection_changed (); void region_selection_changed (); void point_selection_changed (); + void marker_selection_changed (); enum SelectionOp { CreateSelection, @@ -1340,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); @@ -1376,7 +1539,7 @@ class Editor : public PublicEditor void drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event); void end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event); - bool select_all_within (nframes_t start, nframes_t end, gdouble topy, gdouble boty, Selection::Operation op); + bool select_all_within (nframes_t start, nframes_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op); ArdourCanvas::SimpleRect *rubberband_rect; @@ -1396,10 +1559,12 @@ class Editor : public PublicEditor add (text); add (visible); add (tv); + add (route); } Gtk::TreeModelColumn text; Gtk::TreeModelColumn visible; Gtk::TreeModelColumn tv; + Gtk::TreeModelColumn > route; }; RouteDisplayModelColumns route_display_columns; @@ -1410,14 +1575,18 @@ class Editor : public PublicEditor Gtk::ScrolledWindow route_list_scroller; Gtk::Menu* route_list_menu; + void sync_order_keys (); + bool ignore_route_order_sync; + bool route_list_display_button_press (GdkEventButton*); bool route_list_selection_filter (const Glib::RefPtr& model, const Gtk::TreeModel::Path& path, bool yn); void route_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); void route_list_delete (const Gtk::TreeModel::Path&); + void track_list_reorder (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* new_order); + void initial_route_list_display (); void redisplay_route_list(); - void route_list_reordered (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* what); bool ignore_route_list_reorder; bool no_route_list_redisplay; @@ -1504,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; @@ -1618,21 +1794,20 @@ class Editor : public PublicEditor /* duplication */ - void duplicate_dialog (bool for_region); + void duplicate_dialog (bool with_dialog); - /* edit menu */ + nframes64_t event_frame (GdkEvent*, double* px = 0, double* py = 0) const; - Gtk::Menu* edit_menu; - bool edit_menu_map_handler (GdkEventAny*); - - nframes_t event_frame (GdkEvent*, double* px = 0, double* py = 0); + /* returns false if mouse pointer is not in track or marker canvas + */ + bool mouse_frame (nframes64_t&, bool& in_track_canvas) const; void time_fx_motion (ArdourCanvas::Item*, GdkEvent*); void start_time_fx (ArdourCanvas::Item*, GdkEvent*); void end_time_fx (ArdourCanvas::Item*, GdkEvent*); struct TimeStretchDialog : public ArdourDialog { - ARDOUR::Session::TimeStretchRequest request; + ARDOUR::TimeStretchRequest request; Editor& editor; RegionSelection regions; Gtk::ProgressBar progress_bar; @@ -1677,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 */ @@ -1724,9 +1899,9 @@ class Editor : public PublicEditor ImageFrameSocketHandler* image_socket_listener ; /* */ - void toggle_xfade_active (ARDOUR::Crossfade*); - void toggle_xfade_length (ARDOUR::Crossfade*); - void edit_xfade (ARDOUR::Crossfade*); + void toggle_xfade_active (boost::weak_ptr); + void toggle_xfade_length (boost::weak_ptr); + void edit_xfade (boost::weak_ptr); void xfade_edit_left_region (); void xfade_edit_right_region (); @@ -1749,7 +1924,7 @@ class Editor : public PublicEditor /* handling cleanup */ - int playlist_deletion_dialog (ARDOUR::Playlist*); + int playlist_deletion_dialog (boost::shared_ptr); vector session_connections; @@ -1762,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*); @@ -1772,10 +1949,61 @@ class Editor : public PublicEditor void toggle_gain_envelope_visibility (); void toggle_gain_envelope_active (); + void reset_region_gain_envelopes (); + + Gtk::CheckMenuItem* region_envelope_visible_item; + Gtk::CheckMenuItem* region_envelope_active_item; + Gtk::CheckMenuItem* region_mute_item; + Gtk::CheckMenuItem* region_lock_item; + Gtk::CheckMenuItem* region_opaque_item; bool on_key_press_event (GdkEventKey*); + bool on_key_release_event (GdkEventKey*); void session_state_saved (string); + + Glib::RefPtr undo_action; + Glib::RefPtr redo_action; + + void history_changed (); + void color_handler (); + + Gtk::HBox status_bar_hpacker; + + Editing::EditPoint _edit_point; + + Gtk::ComboBoxText edit_point_selector; + + 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__ */