#include <gtkmm2ext/dndtreeview.h>
#include "pbd/stateful.h"
+#include "pbd/signals.h"
+
#include "ardour/import_status.h"
#include "ardour/tempo.h"
#include "ardour/location.h"
#include "editing.h"
#include "enums.h"
#include "editor_items.h"
-#include "canvas-noevent-text.h"
#include "region_selection.h"
#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;
class BundleManager;
class ControlPoint;
class CrossfadeView;
-class Drag;
+class DragManager;
class GlobalPortMatrixWindow;
class GroupedButtons;
class Marker;
class TimeAxisView;
class TimeFXDialog;
class TimeSelection;
-class TrackSelection;
class EditorGroupTabs;
class EditorRoutes;
class EditorRouteGroups;
void set_length (double units);
void set_y_axis (double position);
- sigc::signal<void, nframes64_t> PositionChanged;
+ PBD::Signal1<void, nframes64_t> 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; }
void consider_auditioning (boost::shared_ptr<ARDOUR::Region>);
void hide_a_region (boost::shared_ptr<ARDOUR::Region>);
- void
remove_a_region (boost::shared_ptr<ARDOUR::Region>);
+ void
show_a_region (boost::shared_ptr<ARDOUR::Region>);
#ifdef USE_RUBBERBAND
std::vector<std::string> 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 ();
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;
/* 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 ();
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);
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 queue_draw_resize_line (int at);
+ void start_resize_line_ops ();
+ void end_resize_line_ops ();
+
TrackViewList const & get_track_views () {
return track_views;
}
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<ARDOUR::RouteList>) 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 ();
void map_position_change (nframes64_t);
void color_handler ();
- ARDOUR::Session *session; ///< The session that we are editing, or 0
bool constructed;
// to keep track of the playhead position for control_scroll
Editing::MouseMode mouse_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;
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 *);
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<RouteTimeAxisView*>& relevant_tracks) const;
- void get_equivalent_tracks (RouteTimeAxisView*, std::set<RouteTimeAxisView*> &, ARDOUR::RouteGroup::Property) const;
- void get_equivalent_regions (RegionView* rv, std::vector<RegionView*> &, ARDOUR::RouteGroup::Property) const;
- RegionSelection get_equivalent_regions (RegionSelection &, ARDOUR::RouteGroup::Property) const;
- void mapover_tracks (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*, ARDOUR::RouteGroup::Property) const;
+ void get_equivalent_regions (RegionView* rv, std::vector<RegionView*> &, PBD::PropertyID) const;
+ RegionSelection get_equivalent_regions (RegionSelection &, PBD::PropertyID) const;
+ void mapover_tracks (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*, PBD::PropertyID) const;
/* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
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;
void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
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;
Gtk::HBox bottom_hbox;
Gtk::Table edit_packer;
- Gtk::VScrollbar edit_vscrollbar;
Gtk::Adjustment vertical_adjustment;
Gtk::Adjustment horizontal_adjustment;
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;
void queue_visual_change_y (double);
void ensure_visual_change_idle_handler ();
- void end_location_changed (ARDOUR::Location*);
+ void session_range_location_changed (ARDOUR::Location*);
/* track views */
TrackViewList track_views;
std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
- TimeAxisView* axis_view_from_route (ARDOUR::Route *) const;
- TrackSelection axis_views_from_routes (std::list<ARDOUR::Route *>) const;
+ TimeAxisView* axis_view_from_route (boost::shared_ptr<ARDOUR::Route>) const;
- TrackSelection get_tracks_for_range_action () const;
+ TrackViewList get_tracks_for_range_action () const;
static Gdk::Cursor* cross_hair_cursor;
static Gdk::Cursor* trimmer_cursor;
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 ();
void audition_region_from_region_list ();
void hide_region_from_region_list ();
+ void show_region_in_region_list ();
void align (ARDOUR::RegionPoint);
void align_relative (ARDOUR::RegionPoint);
void drop_paths_part_two (const std::vector<Glib::ustring>& paths, nframes64_t frame, double ypos);
int import_sndfiles (std::vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos,
- int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>, bool, uint32_t total);
+ int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool);
int embed_sndfiles (std::vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
boost::shared_ptr<ARDOUR::MidiTrack> 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;
};
EditorImportStatus import_status;
- gint import_progress_timeout (void *);
static void *_import_thread (void *);
void* import_thread ();
void finish_import ();
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);
bool ignore_gui_changes;
- 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_out_active (bool);
std::set<boost::shared_ptr<ARDOUR::Playlist> > motion_frozen_playlists;
- RegionSelection pre_drag_region_selection;
bool _dragging_playhead;
bool _dragging_edit_point;
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*);
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_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*);
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;
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_marker_menu (bool);
void build_tm_marker_menu ();
void build_new_transport_marker_menu ();
Gtk::Menu* tm_marker_menu;
Gtk::Menu* marker_menu;
- Gtk::Menu* start_end_marker_menu;
+ Gtk::Menu* session_range_marker_menu;
Gtk::Menu* range_marker_menu;
Gtk::Menu* transport_marker_menu;
Gtk::Menu* new_transport_marker_menu;
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);
- 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);
-
uint32_t bbt_beat_subdivision;
/* toolbar */
Gtk::Table toolbar_selection_clock_table;
Gtk::Label toolbar_selection_cursor_label;
- Gtk::HBox mouse_mode_button_box;
- Gtkmm2ext::TearOff* mouse_mode_tearoff;
+ 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;
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;
/* 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;
bool allow_vertical_scroll;
/* trimming */
- void point_trim (GdkEvent*);
+ void point_trim (GdkEvent *, nframes64_t);
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);
XMLNode *before; /* used in *_reversible_command */
- void begin_reversible_command (std::string cmd_name);
- void commit_reversible_command ();
-
void update_title ();
void update_title_s (const std::string & snapshot_name);
~State ();
};
- void store_state (State&) const;
- void restore_state (State *);
-
void instant_save ();
boost::shared_ptr<ARDOUR::AudioRegion> last_audition_region;
/* freeze operations */
ARDOUR::InterThreadInfo freeze_status;
- gint freeze_progress_timeout (void *);
static void* _freeze_thread (void*);
void* freeze_thread ();
bool show_editor_mixer_when_tracks_arrive;
Gtk::VBox current_mixer_strip_vbox;
void cms_new (boost::shared_ptr<ARDOUR::Route>);
- 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);
int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
- std::vector<sigc::connection> session_connections;
+ PBD::ScopedConnectionList session_connections;
/* tracking step changes of track height */
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_at (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
+ void get_regions_after (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
void get_regions_for_action (RegionSelection&, bool allow_entered = false, bool allow_edit_position = true);
- sigc::connection fast_screen_update_connection;
- gint start_updating ();
- gint stop_updating ();
- void fast_update_strips ();
+ void start_updating_meters ();
+ void stop_updating_meters ();
bool meters_running;
void select_next_route ();
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);
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 *);
projects / ardour.git / blobdiff