X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=38129be33b874fdb57a0e1fe022a116ab8dec367;hb=056ceba16a5ab45aabec0cd10ae3228881e640dc;hp=990f6f21367a6a2479e7cba036595df079a52eeb;hpb=498afeb63edeb8a5ce0103296ffda4216d64186d;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 990f6f2136..38129be33b 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2003 Paul Davis + Copyright (C) 2000-2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,17 +38,18 @@ #include -#include #include +#include #include #include #include #include "pbd/stateful.h" -#include "ardour/session.h" +#include "pbd/signals.h" + +#include "ardour/import_status.h" #include "ardour/tempo.h" -#include "ardour/stretch.h" #include "ardour/location.h" #include "ardour/audioregion.h" #include "ardour/track.h" @@ -66,12 +67,15 @@ #include "canvas.h" #include "editor_summary.h" +namespace Gnome { namespace Canvas { + class NoEventText; +} } + namespace Gtkmm2ext { class TearOff; } namespace ARDOUR { - class AudioDiskstream; class RouteGroup; class Playlist; class AudioPlaylist; @@ -83,6 +87,9 @@ namespace ARDOUR { class Filter; class Crossfade; class ChanCount; + class MidiOperator; + class MidiTrack; + class AudioTrack; } namespace LADSPA { @@ -99,10 +106,11 @@ class AutomationTimeAxisView; class BundleManager; class ControlPoint; class CrossfadeView; -class Drag; +class DragManager; class GlobalPortMatrixWindow; class GroupedButtons; class Marker; +class MidiRegionView; class MixerStrip; class PlaylistSelector; class PluginSelector; @@ -114,8 +122,12 @@ class TempoLines; class TimeAxisView; class TimeFXDialog; class TimeSelection; -class TrackSelection; class EditorGroupTabs; +class EditorRoutes; +class EditorRouteGroups; +class EditorRegions; +class EditorLocations; +class EditorSnapshots; /* */ class ImageFrameView; @@ -133,25 +145,26 @@ struct EditorCursor { ArdourCanvas::Line canvas_item; nframes64_t current_frame; double length; - + EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); ~EditorCursor (); - + void set_position (nframes64_t); void set_length (double units); void set_y_axis (double position); - sigc::signal PositionChanged; + PBD::Signal1 PositionChanged; }; -class Editor : public PublicEditor +class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: Editor (); ~Editor (); - - void connect_to_session (ARDOUR::Session *); - ARDOUR::Session* current_session() const { return session; } + + void set_session (ARDOUR::Session *); + ARDOUR::Session* session() const { return _session; } + void first_idle (); virtual bool have_idled () const { return _have_idled; } @@ -160,7 +173,7 @@ class Editor : public PublicEditor nframes64_t current_page_frames() const { return (nframes64_t) floor (_canvas_width * frames_per_unit); } - + double canvas_height () const { return _canvas_height; } @@ -171,28 +184,31 @@ class Editor : public PublicEditor void set_snap_mode (Editing::SnapMode); void set_snap_threshold (double pixel_distance) {snap_threshold = pixel_distance;} + Editing::SnapMode snap_mode () const; + Editing::SnapType snap_type () const; + void undo (uint32_t n = 1); void redo (uint32_t n = 1); XMLNode& get_state (); - int set_state (const XMLNode& ); + int set_state (const XMLNode&, int version); void set_mouse_mode (Editing::MouseMode, bool force=true); void step_mouse_mode (bool next); 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; } + Editing::MidiEditMode current_midi_edit_mode () const; + + bool internal_editing() const { return _internal_editing ; } + void set_internal_edit (bool yn); #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) ; -#endif - TimeAxisView* get_named_time_axis(const std::string & name) ; +#endif /* WITH_CMT */ + void foreach_time_axis_view (sigc::slot); void add_to_idle_resize (TimeAxisView*, int32_t); @@ -200,17 +216,12 @@ class Editor : public PublicEditor void consider_auditioning (boost::shared_ptr); void hide_a_region (boost::shared_ptr); - void remove_a_region (boost::shared_ptr); + void show_a_region (boost::shared_ptr); #ifdef USE_RUBBERBAND std::vector rb_opt_strings; #endif - /* option editor-access */ - - void set_show_waveforms_recording (bool yn); - bool show_waveforms_recording() const { return _show_waveforms_recording; } - /* things that need to be public to be used in the main menubar */ void new_region_from_selection (); @@ -219,7 +230,6 @@ class Editor : public PublicEditor void separate_region_from_punch (); void separate_region_from_loop (); void separate_regions_using_location (ARDOUR::Location&); - void toggle_playback (bool with_abort); void transition_to_rolling (bool forward); /* undo related */ @@ -227,7 +237,7 @@ class Editor : public PublicEditor nframes64_t unit_to_frame (double unit) const { return (nframes64_t) rint (unit * frames_per_unit); } - + double frame_to_unit (nframes64_t frame) const { return rint ((double) frame / (double) frames_per_unit); } @@ -240,11 +250,11 @@ class Editor : public PublicEditor the result of using the world->canvas affine transform on a world coordinate. These coordinates already take into account any scrolling carried out by adjusting the - xscroll_adjustment. + xscroll_adjustment. */ 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 affine, that means that the location *really* is "off @@ -278,6 +288,8 @@ class Editor : public PublicEditor void invert_selection (); void deselect_all (); + void set_selected_regionview_from_region_list (boost::shared_ptr region, Selection::Operation op = Selection::Set); + /* tempo */ void set_show_measures (bool yn); @@ -289,7 +301,7 @@ class Editor : public PublicEditor void analyze_range_selection(); /* export */ - + void export_audio (); void export_selection (); void export_range (); @@ -303,18 +315,17 @@ class Editor : public PublicEditor double get_current_zoom () const { return frames_per_unit; } void temporal_zoom_step (bool coarser); + void tav_zoom_step (bool coarser); /* stuff that AudioTimeAxisView and related classes use */ PlaylistSelector& playlist_selector() const; - void route_name_changed (TimeAxisView *); void clear_playlist (boost::shared_ptr); void new_playlists (TimeAxisView* v); void copy_playlists (TimeAxisView* v); void clear_playlists (TimeAxisView* v); - TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0); void get_onscreen_tracks (TrackViewList&); Width editor_mixer_strip_width; @@ -324,10 +335,12 @@ class Editor : public PublicEditor void show_editor_list (bool yn); void set_selected_mixer_strip (TimeAxisView&); void hide_track_in_display (TimeAxisView& tv, bool temporary = false); - void show_track_in_display (TimeAxisView& tv); /* nudge is initiated by transport controls owned by ARDOUR_UI */ + nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next); + Evoral::MusicalTime get_grid_type_as_beats (bool& success, nframes64_t position); + void nudge_forward (bool next, bool force_playhead); void nudge_backward (bool next, bool force_playhead); @@ -337,14 +350,17 @@ class Editor : public PublicEditor void nudge_backward_capture_offset (); /* playhead/screen stuff */ - + + void set_stationary_playhead (bool yn); + void toggle_stationary_playhead (); + bool stationary_playhead() const { return _stationary_playhead; } + 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_zero_line_visibility (); - void toggle_waveforms_while_recording (); void set_summary (); void set_group_tabs (); void toggle_measure_visibility (); @@ -374,9 +390,6 @@ class Editor : public PublicEditor void scroll_tracks_down_line (); void scroll_tracks_up_line (); - void move_selected_tracks (bool up); - - bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; } void prepare_for_cleanup (); void finish_cleanup (); @@ -384,6 +397,7 @@ class Editor : public PublicEditor void restore_editing_space(); void reset_x_origin (nframes64_t); + void reset_x_origin_to_follow_playhead (); void reset_y_origin (double); void reset_zoom (double); void reposition_and_zoom (nframes64_t, double); @@ -396,13 +410,41 @@ class Editor : public PublicEditor void toggle_meter_updating(); void show_rhythm_ferret(); - void show_bundle_manager (); void show_global_port_matrix (ARDOUR::DataType); void goto_visual_state (uint32_t); void save_visual_state (uint32_t); - void update_rec_display (); + void queue_draw_resize_line (int at); + void start_resize_line_ops (); + void end_resize_line_ops (); + + TrackViewList const & get_track_views () { + return track_views; + } + + int get_regionview_count_from_region_list (boost::shared_ptr); + + void do_import (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&); + void do_embed (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&); + + void get_regions_corresponding_to (boost::shared_ptr region, std::vector& regions); + + void show_verbose_canvas_cursor_with (const std::string& txt); + void hide_verbose_canvas_cursor(); + + void center_screen (nframes64_t); + + TrackViewList axis_views_from_routes (boost::shared_ptr) const; + Gtkmm2ext::TearOff* mouse_mode_tearoff () const { return _mouse_mode_tearoff; } + Gtkmm2ext::TearOff* tools_tearoff () const { return _tools_tearoff; } + + void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false); + void snap_to_with_modifier (nframes64_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false); + void snap_to (nframes64_t& first, nframes64_t& last, int32_t direction = 0, bool for_mark = false); + + void begin_reversible_command (std::string cmd_name); + void commit_reversible_command (); protected: void map_transport_state (); @@ -412,14 +454,13 @@ class Editor : public PublicEditor 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; typedef std::pair TAVState; @@ -429,10 +470,9 @@ class Editor : public PublicEditor double frames_per_unit; nframes64_t leftmost_frame; Editing::ZoomFocus zoom_focus; - bool zoomed_to_region; std::list track_states; }; - + std::list undo_visual_stack; std::list redo_visual_stack; VisualState* current_visual_state (bool with_tracks = true); @@ -441,7 +481,7 @@ class Editor : public PublicEditor void use_visual_state (VisualState&); bool no_save_visual; void swap_visual_state (); - + std::vector visual_states; sigc::connection visual_state_op_connection; void start_visual_state_op (uint32_t n); @@ -456,7 +496,20 @@ class Editor : public PublicEditor void post_zoom (); Editing::MouseMode mouse_mode; - Editing::MidiEditMode midi_edit_mode; + bool _internal_editing; + Editing::MouseMode effective_mouse_mode () const; + + enum JoinObjectRangeState { + JOIN_OBJECT_RANGE_NONE, + /** `join object/range' mode is active and the mouse is over a place where object mode should happen */ + JOIN_OBJECT_RANGE_OBJECT, + /** `join object/range' mode is active and the mouse is over a place where range mode should happen */ + JOIN_OBJECT_RANGE_RANGE + }; + + JoinObjectRangeState _join_object_range_state; + + void update_join_object_range_location (double, double); int post_maximal_editor_width; int post_maximal_pane_position; @@ -476,7 +529,7 @@ class Editor : public PublicEditor void location_changed (ARDOUR::Location *); void location_flags_changed (ARDOUR::Location *, void *); void refresh_location_display (); - void refresh_location_display_s (ARDOUR::Change); + void refresh_location_display_s (const PBD::PropertyChange&); void refresh_location_display_internal (ARDOUR::Locations::LocationList&); void add_new_location (ARDOUR::Location *); void location_gone (ARDOUR::Location *); @@ -496,7 +549,7 @@ class Editor : public PublicEditor bool valid; LocationMarkers () : start(0), end(0), valid (true) {} - + ~LocationMarkers (); void hide(); @@ -532,13 +585,11 @@ class Editor : public PublicEditor CrossfadeView* clicked_crossfadeview; ControlPoint* clicked_control_point; - void sort_track_selection (TrackSelection* sel = 0); + void sort_track_selection (TrackViewList* sel = 0); - void get_relevant_tracks (std::set& relevant_tracks) const; - void get_equivalent_tracks (RouteTimeAxisView*, std::set &, ARDOUR::RouteGroup::Property) const; - void get_equivalent_regions (RegionView* rv, std::vector &, ARDOUR::RouteGroup::Property) const; - RegionSelection get_equivalent_regions (RegionSelection &, ARDOUR::RouteGroup::Property) const; - void mapover_tracks (sigc::slot sl, TimeAxisView*, ARDOUR::RouteGroup::Property) const; + void get_equivalent_regions (RegionView* rv, std::vector &, PBD::PropertyID) const; + RegionSelection get_equivalent_regions (RegionSelection &, PBD::PropertyID) const; + void mapover_tracks (sigc::slot sl, TimeAxisView*, PBD::PropertyID) const; /* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */ @@ -556,19 +607,18 @@ class Editor : public PublicEditor void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false); void select_all_tracks (); - - int get_regionview_count_from_region_list (boost::shared_ptr region); - + bool set_selected_control_point_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); bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr); void collect_new_region_view (RegionView *); void collect_and_select_new_region_view (RegionView *); - + + long select_range_around_region (RegionView *); + Gtk::Menu track_context_menu; Gtk::Menu track_region_context_menu; Gtk::Menu track_selection_context_menu; @@ -592,11 +642,8 @@ class Editor : public PublicEditor 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::RouteList&); - void remove_route (TimeAxisView *); - bool route_removal; + void timeaxisview_deleted (TimeAxisView *); Gtk::HBox global_hpacker; Gtk::VBox global_vpacker; @@ -608,17 +655,16 @@ class Editor : public PublicEditor ArdourCanvas::Canvas* track_canvas; - ArdourCanvas::Text* verbose_canvas_cursor; + ArdourCanvas::NoEventText* verbose_canvas_cursor; bool verbose_cursor_visible; void parameter_changed (std::string); - + bool track_canvas_motion (GdkEvent*); void set_verbose_canvas_cursor (const std::string &, double x, double y); void set_verbose_canvas_cursor_text (const std::string &); void show_verbose_canvas_cursor(); - void hide_verbose_canvas_cursor(); bool verbose_cursor_on; // so far unused @@ -630,7 +676,7 @@ class Editor : public PublicEditor ArdourCanvas::Group *minsec_group; ArdourCanvas::Pixbuf *logo_item; ArdourCanvas::Group *bbt_group; - ArdourCanvas::Group *smpte_group; + ArdourCanvas::Group *timecode_group; ArdourCanvas::Group *frame_group; ArdourCanvas::Group *tempo_group; ArdourCanvas::Group *meter_group; @@ -651,22 +697,22 @@ class Editor : public PublicEditor /** The group containing all items that require horizontal scrolling. */ ArdourCanvas::Group* _background_group; - /* + /* The _master_group is the group containing all items that require horizontal scrolling.. - It is primarily used to separate canvas items - that require horizontal scrolling from those that do not. + It is primarily used to separate canvas items + that require horizontal scrolling from those that do not. */ ArdourCanvas::Group* _master_group; /* The group containing all trackviews. Only scrolled vertically. */ ArdourCanvas::Group* _trackview_group; - + /* The group used for region motion. Sits on top of _trackview_group */ ArdourCanvas::Group* _region_motion_group; - + enum RulerType { - ruler_metric_smpte = 0, + ruler_metric_timecode = 0, ruler_metric_bbt = 1, ruler_metric_frames = 2, ruler_metric_minsec = 3, @@ -691,19 +737,19 @@ class Editor : public PublicEditor Glib::RefPtr ruler_loop_punch_action; Glib::RefPtr ruler_cd_marker_action; 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); Gtk::Widget * ruler_grabbed_widget; - + void initialize_rulers (); - void update_just_smpte (); + void update_just_timecode (); void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers void update_fixed_rulers (); - void update_tempo_based_rulers (); + void update_tempo_based_rulers (); void popup_ruler_menu (nframes64_t where = 0, ItemType type = RegionItem); void update_ruler_visibility (); void set_ruler_visible (RulerType, bool); @@ -712,12 +758,12 @@ class Editor : public PublicEditor gint ruler_label_button_release (GdkEventButton*); void store_ruler_visibility (); void restore_ruler_visibility (); - - static gint _metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint); + + static gint _metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint); static gint _metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); 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, @@ -732,20 +778,20 @@ class Editor : public PublicEditor 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 + enum TimecodeRulerScale { + timecode_show_bits, + timecode_show_frames, + timecode_show_seconds, + timecode_show_minutes, + timecode_show_hours }; - SMPTERulerScale smpte_ruler_scale; + TimecodeRulerScale timecode_ruler_scale; - nframes_t smpte_mark_interval; - gint smpte_mark_modulo; - gint smpte_nmarks; - void set_smpte_ruler_scale (gdouble lower, gdouble upper); + nframes_t timecode_mark_interval; + gint timecode_mark_modulo; + gint timecode_nmarks; + void set_timecode_ruler_scale (gdouble lower, gdouble upper); enum BBTRulerScale { bbt_over, @@ -767,17 +813,17 @@ class Editor : public PublicEditor uint32_t bbt_accent_modulo; void compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper); - gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint); + gint metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); Gtk::Widget *_ruler_separator; - GtkWidget *_smpte_ruler; + GtkWidget *_timecode_ruler; GtkWidget *_bbt_ruler; GtkWidget *_frames_ruler; GtkWidget *_minsec_ruler; - Gtk::Widget *smpte_ruler; + Gtk::Widget *timecode_ruler; Gtk::Widget *bbt_ruler; Gtk::Widget *frames_ruler; Gtk::Widget *minsec_ruler; @@ -788,17 +834,17 @@ class Editor : public PublicEditor gdouble canvas_timebars_vsize; gdouble get_canvas_timebars_vsize () const { return canvas_timebars_vsize; } Gtk::Menu *editor_ruler_menu; - + ArdourCanvas::SimpleRect* tempo_bar; ArdourCanvas::SimpleRect* meter_bar; ArdourCanvas::SimpleRect* marker_bar; ArdourCanvas::SimpleRect* range_marker_bar; ArdourCanvas::SimpleRect* transport_marker_bar; ArdourCanvas::SimpleRect* cd_marker_bar; - + Gtk::Label minsec_label; Gtk::Label bbt_label; - Gtk::Label smpte_label; + Gtk::Label timecode_label; Gtk::Label frame_label; Gtk::Label tempo_label; Gtk::Label meter_label; @@ -811,7 +857,7 @@ class Editor : public PublicEditor Gtk::HBox time_button_hbox; friend class EditorCursor; - + EditorCursor* playhead_cursor; ArdourCanvas::Group* cursor_group; @@ -848,9 +894,8 @@ class Editor : public PublicEditor Gtk::HBox top_hbox; Gtk::HBox bottom_hbox; - + Gtk::Table edit_packer; - Gtk::VScrollbar edit_vscrollbar; Gtk::Adjustment vertical_adjustment; Gtk::Adjustment horizontal_adjustment; @@ -860,14 +905,8 @@ class Editor : public PublicEditor void controls_layout_size_request (Gtk::Requisition*); sigc::connection controls_layout_size_request_connection; - Gtk::HScrollbar edit_hscrollbar; - bool _dragging_hscrollbar; - - void reset_hscrollbar_stepping (); - - bool hscrollbar_button_press (GdkEventButton*); - bool hscrollbar_button_release (GdkEventButton*); - void hscrollbar_allocate (Gtk::Allocation &alloc); + void horizontal_scroll_left (); + void horizontal_scroll_right (); double _canvas_width; double _canvas_height; @@ -891,7 +930,7 @@ class Editor : public PublicEditor sigc::connection control_scroll_connection; gdouble get_trackview_group_vertical_offset () const { return vertical_adjustment.get_value () - canvas_timebars_vsize;} - + ArdourCanvas::Group* get_background_group () const { return _background_group; } ArdourCanvas::Group* get_trackview_group () const { return _trackview_group; } double last_trackview_group_vertical_offset; @@ -900,19 +939,19 @@ class Editor : public PublicEditor void scroll_canvas_vertically (); struct VisualChange { - enum Type { + enum Type { TimeOrigin = 0x1, ZoomLevel = 0x2, YOrigin = 0x4 }; - + Type pending; nframes64_t time_origin; double frames_per_unit; double y_origin; - + int idle_handler_id; - + VisualChange() : pending ((VisualChange::Type) 0), time_origin (0), frames_per_unit (0), idle_handler_id (-1) {} void add (Type t) { pending = Type (pending | t); @@ -930,140 +969,14 @@ class Editor : public PublicEditor void queue_visual_change_y (double); void ensure_visual_change_idle_handler (); - void end_location_changed (ARDOUR::Location*); - - struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - RegionListDisplayModelColumns() { - add (name); - add (region); - add (color_); - add (start); - add (end); - add (length); - add (sync); - add (fadein); - add (fadeout); - add (locked); - add (glued); - add (muted); - add (opaque); - add (used); - add (path); - } - Gtk::TreeModelColumn name; - Gtk::TreeModelColumn > region; - Gtk::TreeModelColumn color_; - Gtk::TreeModelColumn start; - Gtk::TreeModelColumn end; - Gtk::TreeModelColumn length; - Gtk::TreeModelColumn sync; - Gtk::TreeModelColumn fadein; - Gtk::TreeModelColumn fadeout; - Gtk::TreeModelColumn locked; - Gtk::TreeModelColumn glued; - Gtk::TreeModelColumn muted; - Gtk::TreeModelColumn opaque; - Gtk::TreeModelColumn used; - Gtk::TreeModelColumn path; - }; - - 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 (); - sigc::connection region_list_change_connection; - void set_selected_in_region_list(RegionSelection&); - bool set_selected_in_region_list_subrow(boost::shared_ptr, Gtk::TreeModel::Row const &, int); - 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; - Gtk::Frame region_list_frame; - - bool region_list_display_key_press (GdkEventKey *); - bool region_list_display_key_release (GdkEventKey *); - bool region_list_display_button_press (GdkEventButton *); - bool region_list_display_button_release (GdkEventButton *); - void region_list_clear (); - void region_list_selection_mapover (sigc::slot >); - void build_region_list_menu (); - void show_region_list_display_context_menu (int button, int time); - - bool show_automatic_regions_in_region_list; - Editing::RegionListSortType region_list_sort_type; - - void reset_region_list_sort_direction (bool); - void reset_region_list_sort_type (Editing::RegionListSortType); - - void toggle_full_region_list (); - void toggle_show_auto_regions (); - - int region_list_sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator); - - /* snapshots */ - - Gtk::ScrolledWindow snapshot_display_scroller; - struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - SnapshotDisplayModelColumns() { - add (visible_name); - add (real_name); - } - Gtk::TreeModelColumn visible_name; - Gtk::TreeModelColumn real_name; - }; - - 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 */ - - struct NamedSelectionDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - NamedSelectionDisplayModelColumns() { - add (text); - add (selection); - } - Gtk::TreeModelColumn text; - Gtk::TreeModelColumn selection; - }; - - NamedSelectionDisplayModelColumns named_selection_columns; - Glib::RefPtr named_selection_model; - - Gtkmm2ext::DnDTreeView named_selection_display; - Gtk::ScrolledWindow named_selection_scroller; - - 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 (); - - bool named_selection_display_button_release (GdkEventButton *ev); - bool named_selection_display_key_release (GdkEventKey *ev); - void named_selection_display_selection_changed (); + void session_range_location_changed (ARDOUR::Location*); /* track views */ TrackViewList track_views; std::pair trackview_by_y_position (double); - TrackSelection axis_views_from_routes (std::list) const; + TimeAxisView* axis_view_from_route (boost::shared_ptr) const; + + TrackViewList get_tracks_for_range_action () const; static Gdk::Cursor* cross_hair_cursor; static Gdk::Cursor* trimmer_cursor; @@ -1084,13 +997,12 @@ class Editor : public PublicEditor static void build_cursors (); - sigc::connection scroll_connection; + sigc::connection super_rapid_screen_update_connection; nframes64_t last_update_frame; - void center_screen (nframes64_t); void center_screen_internal (nframes64_t, float); - - void update_current_screen (); - + + void super_rapid_screen_update (); + void session_going_away (); nframes64_t cut_buffer_start; @@ -1098,56 +1010,41 @@ class Editor : public PublicEditor bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType); bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); + bool button_press_handler_1 (ArdourCanvas::Item *, GdkEvent *, ItemType); + bool button_press_handler_2 (ArdourCanvas::Item *, GdkEvent *, ItemType); bool button_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); bool motion_handler (ArdourCanvas::Item*, GdkEvent*, bool from_autoscroll = false); bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); bool leave_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); - + /* KEYMAP HANDLING */ void register_actions (); int ensure_cursor (nframes64_t* pos); - void handle_new_region (boost::weak_ptr); - void handle_new_regions (std::vector >& ); - void handle_region_removed (boost::weak_ptr); - void add_region_to_region_display (boost::shared_ptr); - void add_regions_to_region_display (std::vector > & ); - void region_hidden (boost::shared_ptr); - void redisplay_regions (); - void populate_row (boost::shared_ptr, Gtk::TreeModel::Row const &); - void update_region_row (boost::shared_ptr); - bool update_region_subrows (boost::shared_ptr, Gtk::TreeModel::Row const &, int); - void update_all_region_rows (); - void update_all_region_subrows (Gtk::TreeModel::Row const &, int); - bool no_region_list_redisplay; - void insert_into_tmp_regionlist(boost::shared_ptr); - - std::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, RegionSelection&); void cut_copy_ranges (Editing::CutCopyOp); + void cut_copy_midi (Editing::CutCopyOp); void mouse_paste (); void paste_internal (nframes64_t position, float times); /* EDITING OPERATIONS */ - + void reset_point_selection (); void toggle_region_mute (); void toggle_region_lock (); void toggle_region_opaque (); void toggle_record_enable (); - void set_region_lock_style (ARDOUR::Region::PositionLockStyle); + void toggle_region_lock_style (); void raise_region (); void raise_region_to_top (); void lower_region (); void lower_region_to_bottom (); - void split_region (); void split_regions_at (nframes64_t, RegionSelection&); void split_region_at_transients (); void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret); @@ -1163,6 +1060,7 @@ class Editor : public PublicEditor void remove_selected_regions (); void remove_clicked_region (); void edit_region (); + void show_midi_list_editor (); void rename_region (); void duplicate_some_regions (RegionSelection&, float times); void duplicate_selection (float times); @@ -1176,7 +1074,7 @@ class Editor : public PublicEditor void strip_region_silence (); void normalize_region (); double _last_normalization_value; - void denormalize_region (); + void reset_region_scale_amplitude (); void adjust_region_scale_amplitude (bool up); void quantize_region (); @@ -1192,7 +1090,7 @@ class Editor : public PublicEditor void audition_region_from_region_list (); void hide_region_from_region_list (); - void remove_region_from_region_list (); + void show_region_in_region_list (); void align (ARDOUR::RegionPoint); void align_relative (ARDOUR::RegionPoint); @@ -1225,8 +1123,7 @@ class Editor : public PublicEditor void temporal_zoom_selection (); void temporal_zoom_region (bool both_axes); - void toggle_zoom_region (bool both_axes); - bool zoomed_to_region; + void zoom_to_region (bool both_axes); void temporal_zoom_session (); void temporal_zoom (gdouble scale); void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const std::string & op); @@ -1241,7 +1138,7 @@ class Editor : public PublicEditor void insert_route_list_drag (boost::shared_ptr, int x, int y); /* import & embed */ - + void add_external_audio_action (Editing::ImportMode); void external_audio_dialog (); void session_import_dialog (); @@ -1250,18 +1147,15 @@ class Editor : public PublicEditor bool check_multichannel_status (const std::vector& paths); SoundFileOmega* sfbrowser; - + void bring_in_external_audio (Editing::ImportMode mode, nframes64_t& pos); bool idle_drop_paths (std::vector paths, nframes64_t frame, double ypos); void drop_paths_part_two (const std::vector& paths, nframes64_t frame, double ypos); - - void do_import (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&); - void do_embed (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&); int import_sndfiles (std::vector paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos, - int target_regions, int target_tracks, boost::shared_ptr, bool, uint32_t total); - int embed_sndfiles (std::vector paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + int target_regions, int target_tracks, boost::shared_ptr&, bool); + int embed_sndfiles (std::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 (std::vector paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode, @@ -1272,24 +1166,13 @@ class Editor : public PublicEditor boost::shared_ptr get_nth_selected_audio_track (int nth) const; boost::shared_ptr get_nth_selected_midi_track (int nth) const; - /* generic interthread progress window */ - - ArdourDialog* interthread_progress_window; - Gtk::Label interthread_progress_label; - Gtk::VBox interthread_progress_vbox; - Gtk::ProgressBar interthread_progress_bar; - Gtk::Button interthread_cancel_button; - Gtk::Label interthread_cancel_label; - sigc::connection interthread_progress_connection; - void interthread_cancel_clicked (); - void build_interthread_progress_window (); ARDOUR::InterThreadInfo* current_interthread_info; AnalysisWindow* analysis_window; /* import specific info */ - struct EditorImportStatus : public ARDOUR::Session::ImportStatus { + struct EditorImportStatus : public ARDOUR::ImportStatus { Editing::ImportMode mode; nframes64_t pos; int target_tracks; @@ -1299,7 +1182,6 @@ class Editor : public PublicEditor }; EditorImportStatus import_status; - gint import_progress_timeout (void *); static void *_import_thread (void *); void* import_thread (); void finish_import (); @@ -1370,14 +1252,11 @@ class Editor : public PublicEditor void reverse_selection (); void edit_envelope (); - void start_scrolling (); - void stop_scrolling (); - double last_scrub_x; int scrubbing_direction; int scrub_reversals; int scrub_reverse_distance; - void scrub (); + void scrub (nframes64_t, double); void keyboard_selection_begin (); void keyboard_selection_finish (bool add); @@ -1388,34 +1267,30 @@ class Editor : public PublicEditor void extend_selection_to_end_of_region (bool next); void extend_selection_to_start_of_region (bool previous); - Editing::SnapType snap_type; - Editing::SnapMode snap_mode; + Editing::SnapType _snap_type; + Editing::SnapMode _snap_mode; /// Snap threshold in pixels double snap_threshold; - void handle_gui_changes (const std::string &, void *); bool ignore_gui_changes; - void hide_all_tracks (bool with_select); - - Drag* _drag; + DragManager* _drags; - void break_drag (); + void escape (); Gtk::Menu fade_context_menu; void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType); 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; bool _dragging_playhead; bool _dragging_edit_point; @@ -1425,10 +1300,10 @@ class Editor : public PublicEditor gint mouse_rename_region (ArdourCanvas::Item*, GdkEvent*); - void start_region_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*); + void add_region_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*); void start_create_region_grab (ArdourCanvas::Item*, GdkEvent*); - void start_region_copy_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*); - void start_region_brush_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*); + void add_region_copy_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*); + void add_region_brush_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*); void start_selection_grab (ArdourCanvas::Item*, GdkEvent*); void region_view_item_click (AudioRegionView&, GdkEventButton*); @@ -1456,15 +1331,16 @@ class Editor : public PublicEditor bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - + // These variables are used to detect a feedback loop and break it to avoid a gui hang private: ArdourCanvas::Item *last_item_entered; int last_item_entered_n; -public: +public: bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); + bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, RouteTimeAxisView*); @@ -1473,6 +1349,7 @@ public: bool canvas_tempo_marker_event (GdkEvent* event,ArdourCanvas::Item*, TempoMarker*); bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*); bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) ; + bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*); bool canvas_tempo_bar_event (GdkEvent* event, ArdourCanvas::Item*); bool canvas_meter_bar_event (GdkEvent* event, ArdourCanvas::Item*); @@ -1490,6 +1367,11 @@ public: bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*); bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*); + private: + friend class DragManager; + friend class EditorRouteGroups; + friend class EditorRegions; + /* non-public event handlers */ bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*); @@ -1518,15 +1400,15 @@ public: void initialize_canvas (); /* display control */ - + bool _show_measures; /// 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; - + /// true if we scroll the tracks rather than the playhead + bool _stationary_playhead; + ARDOUR::TempoMap::BBTPointList *current_bbt_points; - + TempoLines* tempo_lines; ArdourCanvas::Group* time_line_group; @@ -1544,13 +1426,13 @@ public: void remove_meter_marker (ArdourCanvas::Item*); gint real_remove_tempo_marker (ARDOUR::TempoSection*); gint real_remove_meter_marker (ARDOUR::MeterSection*); - + void edit_tempo_section (ARDOUR::TempoSection*); void edit_meter_section (ARDOUR::MeterSection*); void edit_tempo_marker (ArdourCanvas::Item*); void edit_meter_marker (ArdourCanvas::Item*); void edit_control_point (ArdourCanvas::Item*); - + void marker_menu_edit (); void marker_menu_remove (); void marker_menu_rename (); @@ -1572,17 +1454,18 @@ public: void update_punch_range_view (bool visibility=false); void new_transport_marker_menu_popdown (); void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); - void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); + void tempo_or_meter_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 (bool loop_or_punch); - void build_marker_menu (bool start_or_end); - void build_tm_marker_menu (); + void build_marker_menu (bool); + void build_tempo_or_meter_marker_menu (bool); void build_new_transport_marker_menu (); + void dynamic_cast_marker_object (void*, MeterMarker**, TempoMarker**) const; - Gtk::Menu* tm_marker_menu; + Gtk::Menu* tempo_or_meter_marker_menu; Gtk::Menu* marker_menu; - Gtk::Menu* start_end_marker_menu; + Gtk::Menu* session_range_marker_menu; Gtk::Menu* range_marker_menu; Gtk::Menu* transport_marker_menu; Gtk::Menu* new_transport_marker_menu; @@ -1596,12 +1479,8 @@ public: void draw_metric_marks (const ARDOUR::Metrics& metrics); void compute_current_bbt_points (nframes_t left, nframes_t right); - void tempo_map_changed (ARDOUR::Change); + void tempo_map_changed (const PBD::PropertyChange&); void redisplay_tempo (bool immediate_redraw); - - void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false); - - double snap_length_beats (nframes64_t start); uint32_t bbt_beat_subdivision; @@ -1612,31 +1491,35 @@ public: void editor_mixer_button_toggled (); void editor_list_button_toggled (); - AudioClock edit_point_clock; AudioClock zoom_range_clock; Gtk::Button zoom_in_button; Gtk::Button zoom_out_button; Gtk::Button zoom_out_full_button; Gtk::Button zoom_onetoone_button; + Gtk::Button tav_expand_button; + Gtk::Button tav_shrink_button; + Gtk::VBox toolbar_clock_vbox; - Gtk::VBox toolbar_selection_clock_vbox; + Gtk::VBox toolbar_selection_clock_vbox; Gtk::Table toolbar_selection_clock_table; Gtk::Label toolbar_selection_cursor_label; - - Gtk::HBox mouse_mode_button_box; - Gtkmm2ext::TearOff* mouse_mode_tearoff; - Gtk::ToggleButton mouse_select_button; - Gtk::ToggleButton mouse_move_button; - Gtk::ToggleButton mouse_gain_button; - 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; + + Gtkmm2ext::TearOff* _mouse_mode_tearoff; + Gtk::ToggleButton mouse_select_button; + Gtk::ToggleButton mouse_move_button; + Gtk::ToggleButton mouse_gain_button; + Gtk::ToggleButton mouse_zoom_button; + Gtk::ToggleButton mouse_timefx_button; + Gtk::ToggleButton mouse_audition_button; + Gtk::ToggleButton join_object_range_button; + void mouse_mode_toggled (Editing::MouseMode m); bool ignore_mouse_mode_toggle; + Gtk::ToggleButton internal_edit_button; + void toggle_internal_editing (); + gint mouse_select_button_release (GdkEventButton*); Gtk::VBox automation_box; @@ -1669,47 +1552,35 @@ public: Gtk::VBox zoom_focus_box; std::vector zoom_focus_strings; - + void zoom_focus_selection_done (); void zoom_focus_chosen (Editing::ZoomFocus); Glib::RefPtr zoom_focus_action (Editing::ZoomFocus); Gtk::HBox zoom_box; + Gtk::HBox track_zoom_box; Gtk::VBox zoom_vbox; void zoom_adjustment_changed(); - void edit_point_clock_changed(); - void setup_toolbar (); - Gtkmm2ext::TearOff* tools_tearoff; + void setup_tooltips (); + + Gtkmm2ext::TearOff* _tools_tearoff; Gtk::HBox toolbar_hbox; Gtk::EventBox toolbar_base; Gtk::Frame toolbar_frame; /* midi toolbar */ - Gtk::HBox midi_tool_button_box; - Gtk::ToggleButton midi_tool_pencil_button; - Gtk::ToggleButton midi_tool_select_button; - Gtk::ToggleButton midi_tool_resize_button; - Gtk::ToggleButton midi_tool_erase_button; + Gtk::HBox panic_box; Gtk::Button midi_panic_button; Gtk::ToggleButton midi_sound_notes; - GroupedButtons *midi_tool_button_set; - void midi_edit_mode_toggled (Editing::MidiEditMode m); - void midi_panic_button_pressed (); + void midi_panic (); bool sound_notes () const { return midi_sound_notes.get_active(); } - - 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 */ @@ -1756,133 +1627,31 @@ public: ARDOUR::Location* transport_punch_location(); ARDOUR::Location *temp_location; - + /* object rubberband select process */ - - bool select_all_within (nframes64_t start, nframes64_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op); - + + bool select_all_within (nframes64_t, nframes64_t, double, double, TrackViewList const &, Selection::Operation op); + ArdourCanvas::SimpleRect *rubberband_rect; - + /* mouse zoom process */ ArdourCanvas::SimpleRect *zoom_rect; void reposition_zoom_rect (nframes64_t start, nframes64_t end); - + + EditorRouteGroups* _route_groups; + EditorRoutes* _routes; + EditorRegions* _regions; + EditorSnapshots* _snapshots; + EditorLocations* _locations; + /* diskstream/route display management */ Glib::RefPtr rec_enabled_icon; Glib::RefPtr rec_disabled_icon; - struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - RouteDisplayModelColumns() { - add (text); - add (visible); - add (rec_enabled); - add (temporary_visible); - add (is_track); - add (tv); - add (route); - } - Gtk::TreeModelColumn text; - Gtk::TreeModelColumn visible; - Gtk::TreeModelColumn rec_enabled; - Gtk::TreeModelColumn temporary_visible; - Gtk::TreeModelColumn is_track; - Gtk::TreeModelColumn tv; - Gtk::TreeModelColumn > route; - }; - - void on_tv_rec_enable_toggled(const Glib::ustring& path_string); - - RouteDisplayModelColumns route_display_columns; - Glib::RefPtr route_display_model; Glib::RefPtr route_display_selection; - Gtkmm2ext::DnDTreeView > route_list_display; - Gtk::ScrolledWindow route_list_scroller; - Gtk::Menu* route_list_menu; - - void update_route_visibility (); - - void sync_order_keys (const char*); - bool route_redisplay_does_not_sync_order_keys; - bool route_redisplay_does_not_reset_order_keys; - - 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); - bool ignore_route_list_reorder; - bool no_route_list_redisplay; - bool sync_track_view_list_and_route_list (); - - void build_route_list_menu (); - void show_route_list_menu (); - - void show_all_routes (); - void hide_all_routes (); - void show_all_audiotracks (); - void hide_all_audiotracks (); - void show_all_audiobus (); - void hide_all_audiobus (); - - void set_all_tracks_visibility (bool yn); - void set_all_audio_visibility (int type, bool yn); - - /* edit group management */ - - struct GroupListModelColumns : public Gtk::TreeModel::ColumnRecord { - GroupListModelColumns () { - add (is_visible); - add (text); - add (routegroup); - } - Gtk::TreeModelColumn is_visible; - Gtk::TreeModelColumn text; - Gtk::TreeModelColumn routegroup; - }; - - GroupListModelColumns group_columns; - Glib::RefPtr group_model; - Glib::RefPtr group_selection; - - Gtk::TreeView route_group_display; - Gtk::ScrolledWindow route_group_display_scroller; - Gtk::Menu* route_group_menu; - - void build_route_group_menu (ARDOUR::RouteGroup *); - void activate_all_route_groups (); - void disable_all_route_groups (); - void subgroup_route_group (ARDOUR::RouteGroup*); - void unsubgroup_route_group (ARDOUR::RouteGroup*); - - bool in_route_group_row_change; - void route_group_row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); - void route_group_name_edit (const Glib::ustring&, const Glib::ustring&); - void new_route_group (); - void new_route_group_from_selection (); - void new_route_group_from_rec_enabled (); - void new_route_group_from_soloed (); - void edit_route_group (ARDOUR::RouteGroup *); - void fit_route_group (ARDOUR::RouteGroup *); - void route_group_list_button_clicked (); - gint route_group_list_button_press_event (GdkEventButton* ev); - void add_route_group (ARDOUR::RouteGroup* group); - void remove_selected_route_group (); - void route_groups_changed (); - void group_flags_changed (void*, ARDOUR::RouteGroup*); + bool sync_track_view_list_and_routes (); Gtk::VBox list_vpacker; @@ -1906,10 +1675,10 @@ public: bool allow_vertical_scroll; /* trimming */ - void point_trim (GdkEvent*); - void single_contents_trim (RegionView&, nframes64_t, bool, bool, bool); - void single_start_trim (RegionView&, nframes64_t, bool, bool, bool); - void single_end_trim (RegionView&, nframes64_t, bool, bool, bool); + void point_trim (GdkEvent *, nframes64_t); + void single_contents_trim (RegionView&, nframes64_t, bool, bool); + void single_start_trim (RegionView&, nframes64_t, bool); + void single_end_trim (RegionView&, nframes64_t, bool); void thaw_region_after_trim (RegionView& rv); @@ -1947,14 +1716,6 @@ public: const Gtk::SelectionData& data, guint info, guint time); - - void region_list_display_drag_data_received ( - const Glib::RefPtr& context, - gint x, - gint y, - const Gtk::SelectionData& data, - guint info, - guint time); void drop_paths ( const Glib::RefPtr& context, @@ -1995,10 +1756,7 @@ public: XMLNode *before; /* used in *_reversible_command */ - void begin_reversible_command (std::string cmd_name); - void commit_reversible_command (); - - void update_title (); + void update_title (); void update_title_s (const std::string & snapshot_name); struct State { @@ -2009,17 +1767,13 @@ public: ~State (); }; - void store_state (State&) const; - void restore_state (State *); - void instant_save (); boost::shared_ptr last_audition_region; - + /* freeze operations */ ARDOUR::InterThreadInfo freeze_status; - gint freeze_progress_timeout (void *); static void* _freeze_thread (void*); void* freeze_thread (); @@ -2034,7 +1788,7 @@ public: /* duplication */ void duplicate_dialog (bool with_dialog); - + nframes64_t event_frame (GdkEvent const *, double* px = 0, double* py = 0) const; /* returns false if mouse pointer is not in track or marker canvas @@ -2059,9 +1813,7 @@ public: 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 (); void detach_tearoff (Gtk::Box* b, Gtk::Window* w); void reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n); @@ -2075,7 +1827,7 @@ public: /* xfades */ bool _xfade_visibility; - + #ifdef WITH_CMT void handle_new_imageframe_time_axis_view(const std::string & track_name, void* src) ; void handle_new_imageframe_marker_time_axis_view(const std::string & track_name, TimeAxisView* marked_track) ; @@ -2103,7 +1855,7 @@ public: void imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; void imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; void imageframe_end_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; - + void markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; void markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; void markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; @@ -2134,20 +1886,21 @@ public: Gtk::VBox nudge_vbox; AudioClock nudge_clock; - nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next); - bool nudge_forward_release (GdkEventButton*); bool nudge_backward_release (GdkEventButton*); - + /* audio filters */ void apply_filter (ARDOUR::Filter&, std::string cmd); + Command* apply_midi_note_edit_op_to_region (ARDOUR::MidiOperator& op, MidiRegionView& mrv); + void apply_midi_note_edit_op (ARDOUR::MidiOperator& op); + /* handling cleanup */ int playlist_deletion_dialog (boost::shared_ptr); - std::vector session_connections; + PBD::ScopedConnectionList session_connections; /* tracking step changes of track height */ @@ -2169,8 +1922,6 @@ public: void ensure_track_visible (TimeAxisView*); gint left_automation_track (); - bool _new_regionviews_show_envelope; - void reset_canvas_action_sensitivity (bool); void toggle_gain_envelope_visibility (); void toggle_gain_envelope_active (); @@ -2201,32 +1952,29 @@ public: 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; - void get_regions_at (RegionSelection&, nframes64_t where, const TrackSelection& ts) const; - void get_regions_after (RegionSelection&, nframes64_t where, const TrackSelection& ts) const; - - void get_regions_for_action (RegionSelection&, bool allowed_entered_regionview = false); + void get_regions_at (RegionSelection&, nframes64_t where, const TrackViewList& ts) const; + void get_regions_after (RegionSelection&, nframes64_t where, const TrackViewList& ts) const; - sigc::connection fast_screen_update_connection; - gint start_updating (); - gint stop_updating (); - void fast_update_strips (); + void get_regions_for_action (RegionSelection&, bool allow_entered = false, bool allow_edit_position = true); + + void start_updating_meters (); + void stop_updating_meters (); bool meters_running; void select_next_route (); void select_prev_route (); void snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false); + void timecode_snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false); RhythmFerret* rhythm_ferret; BundleManager* _bundle_manager; GlobalPortMatrixWindow* _global_port_matrix[ARDOUR::DataType::num_types]; - void fit_tracks (TrackSelection &); + void fit_tracks (TrackViewList &); void fit_selected_tracks (); void set_track_height (uint32_t h); @@ -2235,16 +1983,25 @@ public: bool _have_idled; int resize_idle_id; + static gboolean _idle_resize (gpointer); bool idle_resize(); - friend gboolean _idle_resize (gpointer); int32_t _pending_resize_amount; TimeAxisView* _pending_resize_view; void visible_order_range (int*, int*) const; void located (); + + /** true if we've made a locate request that hasn't yet been processed */ bool _pending_locate_request; + + /** if true, there is a pending Session locate which is the initial one when loading a session; + we need to know this so that we don't (necessarily) set the viewport to show the playhead + initially. + */ + bool _pending_initial_locate; + Gtk::HBox _summary_hbox; EditorSummary* _summary; void region_view_added (RegionView *); @@ -2252,8 +2009,12 @@ public: void streamview_height_changed (); EditorGroupTabs* _group_tabs; + void fit_route_group (ARDOUR::RouteGroup *); - void set_route_group_activation (ARDOUR::RouteGroup *, bool); + void start_step_editing (); + void stop_step_editing (); + bool check_step_edit (); + sigc::connection step_edit_connection; friend class Drag; friend class RegionDrag; @@ -2281,6 +2042,8 @@ public: friend class EditorSummary; friend class EditorGroupTabs; + + friend class EditorRoutes; }; #endif /* __ardour_editor_h__ */