#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"
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 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;
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 center_screen (nframes64_t);
+ TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
+
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;
TrackViewList track_views;
std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
TimeAxisView* axis_view_from_route (boost::shared_ptr<ARDOUR::Route>) const;
- TrackSelection axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) 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_internal (nframes64_t, float);
- void update_current_screen ();
+ void super_rapid_screen_update ();
void session_going_away ();
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*);
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);
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_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 ();
+ void setup_tooltips ();
+
Gtkmm2ext::TearOff* tools_tearoff;
Gtk::HBox toolbar_hbox;
Gtk::EventBox toolbar_base;
/* 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);
~State ();
};
- void store_state (State&) const;
- void restore_state (State *);
-
void instant_save ();
boost::shared_ptr<ARDOUR::AudioRegion> last_audition_region;
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);
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