X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=14ed3a46a8d1178ae3901c1dbd501b7c47184f9b;hb=8a2e30816ee392b871c5918f769f68cc0196a893;hp=327a2d2e8e504cc4d6e9f23cf5b7ac41c427af55;hpb=a9f5e379d27f74a1895a3b9d0fd8ef98c3b22e53;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 327a2d2e8e..14ed3a46a8 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -26,9 +26,14 @@ #include #include +#include + +#include + #include #include #include +#include #include @@ -42,6 +47,7 @@ #include #include #include +#include #include #include @@ -55,6 +61,7 @@ #include "region_selection.h" #include "canvas.h" #include "draginfo.h" +#include "tempo_lines.h" namespace Gtkmm2ext { class TearOff; @@ -70,7 +77,7 @@ namespace ARDOUR { class TempoSection; class NamedSelection; class Session; - class AudioFilter; + class Filter; class Crossfade; class ChanCount; } @@ -99,6 +106,7 @@ class MixerStrip; class StreamView; class AudioStreamView; class ControlPoint; +class SoundFileOmega; #ifdef FFT_ANALYSIS class AnalysisWindow; #endif @@ -128,6 +136,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;} @@ -140,18 +150,28 @@ class Editor : public PublicEditor void set_mouse_mode (Editing::MouseMode, bool force=true); void step_mouse_mode (bool next); - Editing::MouseMode current_mouse_mode () { return mouse_mode; } + Editing::MouseMode current_mouse_mode () const { return mouse_mode; } + + void set_midi_edit_cursor (Editing::MidiEditMode); + void set_midi_edit_mode (Editing::MidiEditMode, bool force=true); + Editing::MidiEditMode current_midi_edit_mode () const { return midi_edit_mode; } +#ifdef WITH_CMT 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 std::string & name) ; +#endif void consider_auditioning (boost::shared_ptr); void hide_a_region (boost::shared_ptr); void remove_a_region (boost::shared_ptr); +#ifdef USE_RUBBERBAND + std::vector rb_opt_strings; +#endif + /* option editor-access */ void set_show_waveforms (bool yn); @@ -163,6 +183,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); @@ -170,15 +191,15 @@ class Editor : public PublicEditor /* undo related */ - 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); } @@ -189,7 +210,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 @@ -204,10 +225,12 @@ 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; } @@ -216,10 +239,11 @@ class Editor : public PublicEditor bool extend_selection_to_track (TimeAxisView&); void play_selection (); - void select_all_in_track (Selection::Operation op); + void select_all_in_selected_tracks (Selection::Operation op); void select_all (Selection::Operation op); - void invert_selection_in_track (); + void invert_selection_in_selected_tracks (); void invert_selection (); + void deselect_all (); /* tempo */ @@ -242,10 +266,11 @@ class Editor : public PublicEditor 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); @@ -253,18 +278,18 @@ 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 (); - void copy_playlists (); - void clear_playlists (); + void new_playlists (TimeAxisView* v); + void copy_playlists (TimeAxisView* v); + void clear_playlists (TimeAxisView* v); 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 show_editor_list (bool yn); void set_selected_mixer_strip (TimeAxisView&); void hide_track_in_display (TimeAxisView& tv); void show_track_in_display (TimeAxisView& tv); @@ -289,6 +314,7 @@ class Editor : public PublicEditor void toggle_waveform_visibility (); void toggle_waveforms_while_recording (); void toggle_measure_visibility (); + void toggle_logo_visibility (); /* SMPTE timecode & video sync */ @@ -305,12 +331,15 @@ class Editor : public PublicEditor 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); /* layers */ void set_layer_model (ARDOUR::LayerModel); void update_layering_model (); + + void toggle_link_region_and_track_selection (); /* redirect shared ops menu. caller must free returned menu */ @@ -335,7 +364,12 @@ 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 (bool ignore_playhead = false); + + bool update_mouse_speed (); + bool decelerate_mouse_speed (); + + void toggle_meter_updating(); protected: void map_transport_state (); @@ -344,15 +378,36 @@ class Editor : public PublicEditor void on_realize(); private: - + + /// The session that we are editing, or 0 + void color_handler (); ARDOUR::Session *session; 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; + Editing::MidiEditMode midi_edit_mode; int post_maximal_editor_width; int post_maximal_pane_position; @@ -378,6 +433,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; @@ -388,7 +444,10 @@ class Editor : public PublicEditor struct LocationMarkers { Marker* start; Marker* end; + bool valid; + LocationMarkers () : start(0), end(0), valid (true) {} + ~LocationMarkers (); void hide(); @@ -398,33 +457,40 @@ 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_axisview; RouteTimeAxisView* clicked_routeview; + /** The last RegionView that was clicked on, or 0 if the last click was not + * on a RegionView. This is set up by the canvas event handlers in + * editor_canvas_events.cc + */ RegionView* clicked_regionview; - RegionView* latest_regionview; + RegionSelection latest_regionviews; uint32_t clicked_selection; CrossfadeView* clicked_crossfadeview; ControlPoint* clicked_control_point; - void sort_track_selection (); + void sort_track_selection (TrackSelection* sel = 0); void get_relevant_tracks (std::set& relevant_tracks); - void get_equivalent_regions (RegionView* rv, std::vector&); - void mapover_tracks (sigc::slot sl); + void get_equivalent_regions (RegionView* rv, std::vector&) const; + void mapover_tracks (sigc::slot sl, TimeAxisView*) const; /* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */ - void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector*); + void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector*) const; void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t); void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t); void mapped_clear_playlist (RouteTimeAxisView&, uint32_t); @@ -436,40 +502,30 @@ 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); - bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr); void collect_new_region_view (RegionView *); - - Gtk::Menu track_context_menu; - Gtk::Menu track_region_context_menu; - Gtk::Menu track_selection_context_menu; - Gtk::Menu track_crossfade_context_menu; + void collect_and_select_new_region_view (RegionView *); Gtk::MenuItem* region_edit_menu_split_item; Gtk::MenuItem* region_edit_menu_split_multichannel_item; - Gtk::Menu * track_region_edit_playlist_menu; - Gtk::Menu * track_edit_playlist_submenu; - Gtk::Menu * track_selection_edit_playlist_submenu; - - void popup_track_context_menu (int, int, ItemType, bool, nframes_t); + + void popup_track_context_menu (int, int, nframes_t); Gtk::Menu* build_track_context_menu (nframes_t); - Gtk::Menu* build_track_bus_context_menu (nframes_t); - Gtk::Menu* build_track_region_context_menu (nframes_t frame); - Gtk::Menu* build_track_crossfade_context_menu (nframes_t); - Gtk::Menu* build_track_selection_context_menu (nframes_t); - 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_bus_or_audio_track_context_items (Gtk::Menu_Helpers::MenuList&); + void add_region_context_items (Gtk::Menu_Helpers::MenuList&); 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 add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList&, Gtk::Menu_Helpers::MenuElem, bool) const; + void handle_new_route (ARDOUR::Session::RouteList&); void remove_route (TimeAxisView *); bool route_removal; @@ -504,6 +560,7 @@ class Editor : public PublicEditor Gtk::Frame time_button_frame; ArdourCanvas::Group *minsec_group; + ArdourCanvas::Pixbuf *logo_item; ArdourCanvas::Group *bbt_group; ArdourCanvas::Group *smpte_group; ArdourCanvas::Group *frame_group; @@ -512,6 +569,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, @@ -524,21 +582,24 @@ 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*); gint ruler_button_release (GdkEventButton*); gint ruler_mouse_motion (GdkEventMotion*); + bool ruler_scroll (GdkEventScroll* event); gint ruler_pressed_button; Gtk::Widget * ruler_grabbed_widget; void initialize_rulers (); void update_just_smpte (); + void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers void update_fixed_rulers (); void update_tempo_based_rulers (); void popup_ruler_menu (nframes_t where = 0, ItemType type = RegionItem); @@ -553,6 +614,55 @@ class Editor : public PublicEditor static gint _metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); static gint _metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); + enum MinsecRulerScale { + minsec_show_seconds, + minsec_show_minutes, + minsec_show_hours, + minsec_show_frames + }; + + MinsecRulerScale minsec_ruler_scale; + + nframes_t minsec_mark_interval; + gint minsec_mark_modulo; + gint minsec_nmarks; + void set_minsec_ruler_scale (gdouble lower, gdouble upper); + + enum SMPTERulerScale { + smpte_show_bits, + smpte_show_frames, + smpte_show_seconds, + smpte_show_minutes, + smpte_show_hours + }; + + SMPTERulerScale smpte_ruler_scale; + + nframes_t smpte_mark_interval; + gint smpte_mark_modulo; + gint smpte_nmarks; + void set_smpte_ruler_scale (gdouble lower, gdouble upper); + + enum BBTRulerScale { + bbt_over, + bbt_show_64, + bbt_show_16, + bbt_show_4, + bbt_show_1, + bbt_show_beats, + bbt_show_ticks, + bbt_show_ticks_detail, + bbt_show_ticks_super_detail + }; + + BBTRulerScale bbt_ruler_scale; + + uint32_t bbt_bars; + gint bbt_nmarks; + uint32_t bbt_bar_helper_on; + uint32_t bbt_accent_modulo; + void compute_bbt_ruler_scale (nframes_t lower, nframes_t upper); + gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); @@ -578,14 +688,8 @@ 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; - ArdourCanvas::SimpleLine* meter_line; - ArdourCanvas::SimpleLine* marker_line; - ArdourCanvas::SimpleLine* range_marker_line; - ArdourCanvas::SimpleLine* transport_marker_line; - Gtk::Label minsec_label; Gtk::Label bbt_label; Gtk::Label smpte_label; @@ -595,6 +699,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; @@ -620,18 +725,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 (); @@ -683,6 +803,7 @@ class Editor : public PublicEditor void tie_vertical_scrolling (); void canvas_horizontally_scrolled (); + void canvas_scroll_to (nframes64_t); struct VisualChange { enum Type { @@ -723,13 +844,16 @@ 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_region_changed (ARDOUR::Change, boost::weak_ptr); 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; @@ -757,7 +881,7 @@ class Editor : public PublicEditor /* snapshots */ - Gtk::ScrolledWindow snapshot_display_scroller; + Gtk::ScrolledWindow snapshot_display_scroller; struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { SnapshotDisplayModelColumns() { add (visible_name); @@ -820,8 +944,12 @@ class Editor : public PublicEditor static Gdk::Cursor* time_fx_cursor; static Gdk::Cursor* fader_cursor; static Gdk::Cursor* speaker_cursor; + static Gdk::Cursor* midi_pencil_cursor; + static Gdk::Cursor* midi_select_cursor; + static Gdk::Cursor* midi_erase_cursor; static Gdk::Cursor* wait_cursor; static Gdk::Cursor* timebar_cursor; + static Gdk::Cursor* transparent_cursor; static void build_cursors (); @@ -860,6 +988,7 @@ class Editor : public PublicEditor list > tmp_region_list; void cut_copy (Editing::CutCopyOp); + bool can_cut_copy () const; void cut_copy_points (Editing::CutCopyOp); void cut_copy_regions (Editing::CutCopyOp); void cut_copy_ranges (Editing::CutCopyOp); @@ -873,6 +1002,7 @@ class Editor : public PublicEditor void toggle_region_mute (); void toggle_region_lock (); void toggle_region_opaque (); + void toggle_region_position_lock (); void raise_region (); void raise_region_to_top (); void lower_region (); @@ -881,16 +1011,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_selected_regions (); 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 (); @@ -899,9 +1031,10 @@ class Editor : public PublicEditor void audition_playlist_region_standalone (boost::shared_ptr); void audition_playlist_region_via_route (boost::shared_ptr, ARDOUR::Route&); void split_multichannel_region(); - void reverse_region (); - void normalize_region (); - void denormalize_region (); + void reverse_regions (); + void normalize_regions (); + void denormalize_regions (); + void quantize_regions (); void audition_region_from_region_list (); void hide_region_from_region_list (); @@ -913,6 +1046,8 @@ class Editor : public PublicEditor void reset_focus (); + void split (); + void cut (); void copy (); void paste (float times); @@ -920,28 +1055,24 @@ 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_from_edit_point_and_return (); void play_selected_region (); - void audition_selected_region (); + void play_edit_range (); 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 toggle_zoom_region (); + bool zoomed_to_region; void temporal_zoom_session (); void temporal_zoom (gdouble scale); void temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op); @@ -953,15 +1084,32 @@ class Editor : public PublicEditor void insert_region_list_drag (boost::shared_ptr, int x, int y); void insert_region_list_selection (float times); + /* import & embed */ + 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 _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&); - 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 (vector paths, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos); - int embed_sndfile (vector paths, 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); + 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 */ @@ -996,7 +1144,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 (); @@ -1030,11 +1178,22 @@ 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_punch_from_region (); + + 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 (); @@ -1042,6 +1201,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; @@ -1053,6 +1218,8 @@ class Editor : public PublicEditor Editing::SnapType snap_type; Editing::SnapMode snap_mode; + + /// Snap threshold in pixels double snap_threshold; void handle_gui_changes (const string &, void *); @@ -1078,15 +1245,25 @@ 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*); + void create_region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void create_region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + bool check_region_drag_possible (RouteTimeAxisView**); + 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*); @@ -1105,6 +1282,7 @@ class Editor : public PublicEditor gint mouse_rename_region (ArdourCanvas::Item*, GdkEvent*); void start_region_grab (ArdourCanvas::Item*, GdkEvent*); + void start_create_region_grab (ArdourCanvas::Item*, GdkEvent*); void start_region_copy_grab (ArdourCanvas::Item*, GdkEvent*); void start_region_brush_grab (ArdourCanvas::Item*, GdkEvent*); void start_selection_grab (ArdourCanvas::Item*, GdkEvent*); @@ -1157,6 +1335,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*); @@ -1170,62 +1349,57 @@ 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 time_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); + bool time_canvas_scroll_event (GdkEventScroll* 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*); void handle_new_duration (); void initialize_canvas (); + int canvas_hroizontally_scrolled_handler_id; + void reset_horizontally_scrolling_region (Gtk::Allocation* alloc = 0); void reset_scrolling_region (Gtk::Allocation* alloc = 0); /* display control */ bool _show_measures; + /// true to show waveforms, otherwise false bool _show_waveforms; + /// true if the editor should follow the playhead, otherwise false bool _follow_playhead; + /// true if waveforms should be shown while recording audio tracks, otherwise false bool _show_waveforms_recording; ARDOUR::TempoMap::BBTPointList *current_bbt_points; - typedef vector TimeLineList; - TimeLineList free_measure_lines; - TimeLineList used_measure_lines; - ArdourCanvas::Group* time_line_group; - ArdourCanvas::SimpleLine* get_time_line (); + ArdourCanvas::Group* marker_time_line_group; + + TempoLines* tempo_lines; + TempoLines* marker_tempo_lines; + void hide_measures (); void draw_measures (); - bool lazy_hide_and_draw_measures (); + bool redraw_measures (); void new_tempo_section (); @@ -1245,6 +1419,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 (); @@ -1275,6 +1450,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; @@ -1283,19 +1459,32 @@ class Editor : public PublicEditor void remove_metric_marks (); void draw_metric_marks (const ARDOUR::Metrics& metrics); + void compute_current_bbt_points (nframes_t left, nframes_t right); + int tempo_map_change_idle_handler_id; void tempo_map_changed (ARDOUR::Change); 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; + } + + double snap_length_beats (nframes_t start); + uint32_t bbt_beat_subdivision; /* toolbar */ - Gtk::ToggleButton editor_mixer_button; + Gtk::ToggleButton editor_mixer_button; + Gtk::ToggleButton editor_list_button; void editor_mixer_button_toggled (); + void editor_list_button_toggled (); - AudioClock edit_cursor_clock; + AudioClock edit_point_clock; AudioClock zoom_range_clock; Gtk::Button zoom_in_button; Gtk::Button zoom_out_button; @@ -1315,6 +1504,7 @@ class Editor : public PublicEditor Gtk::ToggleButton mouse_zoom_button; Gtk::ToggleButton mouse_timefx_button; Gtk::ToggleButton mouse_audition_button; + Gtk::ToggleButton mouse_note_button; GroupedButtons *mouse_mode_button_set; void mouse_mode_toggled (Editing::MouseMode m); bool ignore_mouse_mode_toggle; @@ -1328,6 +1518,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; @@ -1359,15 +1551,33 @@ class Editor : public PublicEditor void zoom_adjustment_changed(); - void edit_cursor_clock_changed(); + void edit_point_clock_changed(); void setup_toolbar (); - Gtkmm2ext::TearOff* tools_tearoff; + Gtkmm2ext::TearOff* tools_tearoff; Gtk::HBox toolbar_hbox; Gtk::EventBox toolbar_base; Gtk::Frame toolbar_frame; + /* midi toolbar */ + + Gtk::HBox midi_tool_button_box; + Gtkmm2ext::TearOff* midi_tool_tearoff; + Gtk::ToggleButton midi_tool_pencil_button; + Gtk::ToggleButton midi_tool_select_button; + Gtk::ToggleButton midi_tool_erase_button; + GroupedButtons *midi_tool_button_set; + void midi_edit_mode_toggled (Editing::MidiEditMode m); + bool ignore_midi_edit_mode_toggle; + + Gtkmm2ext::TearOff* midi_tools_tearoff; + Gtk::HBox midi_toolbar_hbox; + Gtk::EventBox midi_toolbar_base; + Gtk::Frame midi_toolbar_frame; + + void setup_midi_toolbar (); + /* selection process */ Selection* selection; @@ -1377,6 +1587,7 @@ class Editor : public PublicEditor void track_selection_changed (); void region_selection_changed (); void point_selection_changed (); + void marker_selection_changed (); enum SelectionOp { CreateSelection, @@ -1399,7 +1610,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); @@ -1455,10 +1667,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; @@ -1469,11 +1683,23 @@ 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*); + void route_list_display_drag_data_received (const Glib::RefPtr& context, + gint x, + gint y, + const Gtk::SelectionData& data, + guint info, + guint time); + 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); @@ -1563,9 +1789,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; @@ -1648,10 +1881,10 @@ class Editor : public PublicEditor struct State { Selection* selection; - double frames_per_unit; + double frames_per_unit; - State(); - ~State(); + State (PublicEditor const * e); + ~State (); }; void store_state (State&) const; @@ -1668,8 +1901,8 @@ class Editor : public PublicEditor static void* _freeze_thread (void*); void* freeze_thread (); - void freeze_route (); - void unfreeze_route (); + void freeze_routes (); + void unfreeze_routes (); /* edit-group solo + mute */ @@ -1678,51 +1911,76 @@ class Editor : public PublicEditor /* duplication */ - void duplicate_dialog (bool for_region); + void duplicate_dialog (bool with_dialog); - nframes_t event_frame (GdkEvent*, double* px = 0, double* py = 0); + nframes64_t event_frame (GdkEvent*, double* px = 0, double* py = 0) const; + + /* 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; + struct TimeFXDialog : public ArdourDialog { + ARDOUR::TimeFXRequest request; Editor& editor; + bool pitching; + Gtk::Adjustment pitch_octave_adjustment; + Gtk::Adjustment pitch_semitone_adjustment; + Gtk::Adjustment pitch_cent_adjustment; + Gtk::SpinButton pitch_octave_spinner; + Gtk::SpinButton pitch_semitone_spinner; + Gtk::SpinButton pitch_cent_spinner; RegionSelection regions; Gtk::ProgressBar progress_bar; + + /* SoundTouch */ Gtk::ToggleButton quick_button; Gtk::ToggleButton antialias_button; + Gtk::HBox upper_button_box; + + /* RubberBand */ + Gtk::ComboBoxText stretch_opts_selector; + Gtk::Label stretch_opts_label; + Gtk::ToggleButton precise_button; + Gtk::HBox opts_box; + Gtk::Button* cancel_button; Gtk::Button* action_button; - Gtk::HBox upper_button_box; Gtk::VBox packer; int status; - TimeStretchDialog (Editor& e); + TimeFXDialog (Editor& e, bool for_pitch); gint update_progress (); sigc::connection first_cancel; sigc::connection first_delete; - void cancel_timestretch_in_progress (); - gint delete_timestretch_in_progress (GdkEventAny*); + void cancel_in_progress (); + gint delete_in_progress (GdkEventAny*); }; /* "whats mine is yours" */ - friend class TimeStretchDialog; + friend class TimeFXDialog; - TimeStretchDialog* current_timestretch; + TimeFXDialog* current_timefx; - static void* timestretch_thread (void *arg); - int run_timestretch (RegionSelection&, float fraction); - void do_timestretch (TimeStretchDialog&); + static void* timefx_thread (void *arg); + void do_timefx (TimeFXDialog&); + + int time_stretch (RegionSelection&, float fraction); + int pitch_shift (RegionSelection&, float cents); + void pitch_shift_regions (); + int time_fx (RegionSelection&, float val, bool pitching); /* editor-mixer strip */ MixerStrip *current_mixer_strip; bool show_editor_mixer_when_tracks_arrive; Gtk::VBox current_mixer_strip_vbox; + void cms_new (boost::shared_ptr); void cms_deleted (); void current_mixer_strip_hidden (); void current_mixer_strip_removed (); @@ -1732,13 +1990,13 @@ class Editor : public PublicEditor /* nudging tracks */ - void nudge_track (bool use_edit_cursor, bool forwards); + void nudge_selected_tracks (bool use_edit_cursor, bool forwards); /* xfades */ bool _xfade_visibility; - /* */ +#ifdef WITH_CMT void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ; void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ; @@ -1777,7 +2035,7 @@ class Editor : public PublicEditor void popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_frame) ; ImageFrameSocketHandler* image_socket_listener ; - /* */ +#endif void toggle_xfade_active (boost::weak_ptr); void toggle_xfade_length (boost::weak_ptr); @@ -1800,7 +2058,7 @@ class Editor : public PublicEditor /* audio filters */ - void apply_filter (ARDOUR::AudioFilter&, string cmd); + void apply_filter (ARDOUR::Filter&, string cmd); /* handling cleanup */ @@ -1817,6 +2075,20 @@ class Editor : public PublicEditor TimeAxisView* entered_track; RegionView* entered_regionview; + + class ExclusiveRegionSelection { + public: + ExclusiveRegionSelection (Editor&, RegionView*); + ~ExclusiveRegionSelection (); + + private: + Editor& editor; + RegionView* regionview; + bool remove; + }; + + 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*); @@ -1833,9 +2105,11 @@ class Editor : public PublicEditor Gtk::CheckMenuItem* region_envelope_active_item; Gtk::CheckMenuItem* region_mute_item; Gtk::CheckMenuItem* region_lock_item; + Gtk::CheckMenuItem* region_lock_position_item; Gtk::CheckMenuItem* region_opaque_item; bool on_key_press_event (GdkEventKey*); + bool on_key_release_event (GdkEventKey*); void session_state_saved (string); @@ -1843,6 +2117,42 @@ class Editor : public PublicEditor Glib::RefPtr redo_action; void history_changed (); + + 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 fast_update_strips (); + bool meters_running; + + void select_next_route (); + void select_prev_route (); }; #endif /* __ardour_editor_h__ */