X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.h;h=7ffb7ef57ed099091a27b4423e26d187bcf91606;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=7649813269ac8ad737b8433033e1c1071e244c1f;hpb=c22e96522d9275db4b1b4ba8edddbda5e7f798b9;p=ardour.git diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 7649813269..7ffb7ef57e 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -25,12 +25,26 @@ #include #include +#include "ardour/tempo.h" #include "ardour/types.h" +#include "canvas/types.h" + +#include "cursor_context.h" #include "editor_items.h" +#include "mouse_cursors.h" +#include "editing.h" +#include "track_selection.h" namespace ARDOUR { class Location; + class TempoSection; +} + +namespace ArdourCanvas { + class Item; + class Line; + class Rectangle; } namespace PBD { @@ -44,6 +58,18 @@ class TimeAxisView; class MidiTimeAxisView; class Drag; class NoteBase; +class RegionView; +class TimeAxisView; +class RouteTimeAxisView; +class RegionSelection; +class MidiRegionView; +class MeterMarker; +class ArdourMarker; +class TempoMarker; +class ControlPoint; +class AudioRegionView; +class AutomationLine; +class AutomationTimeAxisView; /** Class to manage current drags */ class DragManager @@ -54,16 +80,15 @@ public: ~DragManager (); bool motion_handler (GdkEvent *, bool); - bool window_motion_handler (GdkEvent *, bool); void abort (); void add (Drag *); - void set (Drag *, GdkEvent *, Gdk::Cursor* c = 0); - void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void set (Drag *, GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor()); + void start_grab (GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor()); bool end_grab (GdkEvent *); bool have_item (ArdourCanvas::Item *) const; - void mark_double_click (); + void mark_double_click (); /** @return true if an end drag or abort is in progress */ bool ending () const { @@ -84,9 +109,9 @@ public: return _current_pointer_y; } - /** @return current pointer frame */ - ARDOUR::framepos_t current_pointer_frame () const { - return _current_pointer_frame; + /** @return current pointer sample */ + ARDOUR::samplepos_t current_pointer_sample () const { + return _current_pointer_sample; } private: @@ -95,7 +120,7 @@ private: bool _ending; ///< true if end_grab or abort is in progress, otherwise false double _current_pointer_x; ///< canvas-coordinate space x of the current pointer double _current_pointer_y; ///< canvas-coordinate space y of the current pointer - ARDOUR::framepos_t _current_pointer_frame; ///< frame that the pointer is now at + ARDOUR::samplepos_t _current_pointer_sample; ///< sample that the pointer is now at bool _old_follow_playhead; ///< state of Editor::follow_playhead() before the drags started }; @@ -103,7 +128,7 @@ private: class Drag { public: - Drag (Editor *, ArdourCanvas::Item *, bool trackview_only = true); + Drag (Editor *, ArdourCanvas::Item *, bool trackview_only = true); virtual ~Drag () {} void set_manager (DragManager* m) { @@ -119,11 +144,11 @@ public: bool motion_handler (GdkEvent*, bool); void abort (); - ARDOUR::framepos_t adjusted_frame (ARDOUR::framepos_t, GdkEvent const *, bool snap = true) const; - ARDOUR::framepos_t adjusted_current_frame (GdkEvent const *, bool snap = true) const; + ARDOUR::MusicSample adjusted_sample (ARDOUR::samplepos_t, GdkEvent const *, bool snap = true) const; + ARDOUR::samplepos_t adjusted_current_sample (GdkEvent const *, bool snap = true) const; - bool was_double_click() const { return _was_double_click; } - void set_double_click (bool yn) { _was_double_click = yn; } + bool was_double_click() const { return _was_double_click; } + void set_double_click (bool yn) { _was_double_click = yn; } /** Called to start a grab of an item. * @param e Event that caused the grab to start. @@ -155,11 +180,11 @@ public: * @return true if this drag should happen in this mouse mode. */ virtual bool active (Editing::MouseMode m) { - return (m != Editing::MouseGain); + return true; } - /** @return minimum number of frames (in x) and pixels (in y) that should be considered a movement */ - virtual std::pair move_threshold () const { + /** @return minimum number of samples (in x) and pixels (in y) that should be considered a movement */ + virtual std::pair move_threshold () const { return std::make_pair (1, 1); } @@ -177,9 +202,13 @@ public: return true; } - /** Set up the _pointer_frame_offset */ - virtual void setup_pointer_frame_offset () { - _pointer_frame_offset = 0; + bool initially_vertical() const { + return _initially_vertical; + } + + /** Set up the _pointer_sample_offset */ + virtual void setup_pointer_sample_offset () { + _pointer_sample_offset = 0; } protected: @@ -192,12 +221,12 @@ protected: return _grab_y; } - ARDOUR::framepos_t raw_grab_frame () const { - return _raw_grab_frame; + ARDOUR::samplepos_t raw_grab_sample () const { + return _raw_grab_sample; } - ARDOUR::framepos_t grab_frame () const { - return _grab_frame; + ARDOUR::samplepos_t grab_sample () const { + return _grab_sample; } double last_pointer_x () const { @@ -208,23 +237,30 @@ protected: return _last_pointer_y; } - double last_pointer_frame () const { - return _last_pointer_frame; + ARDOUR::samplepos_t last_pointer_sample () const { + return _last_pointer_sample; } + ARDOUR::sampleoffset_t snap_delta (guint const) const; + double snap_delta_music (guint const) const; + + double current_pointer_x () const; double current_pointer_y () const; - boost::shared_ptr add_midi_region (MidiTimeAxisView*); + /* sets snap delta from unsnapped pos */ + void setup_snap_delta (ARDOUR::MusicSample pos); - void show_verbose_cursor_time (framepos_t); - void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0); + boost::shared_ptr add_midi_region (MidiTimeAxisView*, bool commit); + + void show_verbose_cursor_time (samplepos_t); + void show_verbose_cursor_duration (samplepos_t, samplepos_t, double xoffset = 0); void show_verbose_cursor_text (std::string const &); Editor* _editor; ///< our editor DragManager* _drags; ArdourCanvas::Item* _item; ///< our item /** Offset from the mouse's position for the drag to the start of the thing that is being dragged */ - ARDOUR::framecnt_t _pointer_frame_offset; + ARDOUR::samplecnt_t _pointer_sample_offset; bool _x_constrained; ///< true if x motion is constrained, otherwise false bool _y_constrained; ///< true if y motion is constrained, otherwise false bool _was_rolling; ///< true if the session was rolling before the drag started, otherwise false @@ -232,14 +268,24 @@ protected: private: bool _trackview_only; ///< true if pointer y value should always be relative to the top of the trackview group bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false - bool _was_double_click; ///< true if drag initiated by a double click event + bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false + bool _initially_vertical; ///< true if after move threshold is passed we appear to be moving vertically; undefined before that + bool _was_double_click; ///< true if drag initiated by a double click event double _grab_x; ///< trackview x of the grab start position double _grab_y; ///< y of the grab start position, possibly adjusted if _trackview_only is true double _last_pointer_x; ///< trackview x of the pointer last time a motion occurred double _last_pointer_y; ///< trackview y of the pointer last time a motion occurred - ARDOUR::framepos_t _raw_grab_frame; ///< unsnapped frame that the mouse was at when start_grab was called, or 0 - ARDOUR::framepos_t _grab_frame; ///< adjusted_frame that the mouse was at when start_grab was called, or 0 - ARDOUR::framepos_t _last_pointer_frame; ///< adjusted_frame the last time a motion occurred + ARDOUR::samplepos_t _raw_grab_sample; ///< unsnapped sample that the mouse was at when start_grab was called, or 0 + ARDOUR::samplepos_t _grab_sample; ///< adjusted_sample that the mouse was at when start_grab was called, or 0 + ARDOUR::samplepos_t _last_pointer_sample; ///< adjusted_sample the last time a motion occurred + + /* difference between some key position's snapped and unsnapped + * samplepos. used for relative snap. + */ + samplepos_t _snap_delta; + double _snap_delta_music; + CursorContext::Handle _cursor_ctx; ///< cursor change context + bool _constraint_pressed; ///< if the keyboard indicated constraint modifier was pressed on start_grab() }; class RegionDrag; @@ -248,7 +294,7 @@ class RegionDrag; class DraggingView { public: - DraggingView (RegionView *, RegionDrag *); + DraggingView (RegionView *, RegionDrag *, TimeAxisView* original_tav); RegionView* view; ///< the view /** index into RegionDrag::_time_axis_views of the view that this region is currently being displayed on, @@ -261,10 +307,11 @@ public: */ double layer; double initial_y; ///< the initial y position of the view before any reparenting - framepos_t initial_position; ///< initial position of the region - framepos_t initial_end; ///< initial end position of the region - framepos_t anchored_fade_length; ///< fade_length when anchored during drag + samplepos_t initial_position; ///< initial position of the region + samplepos_t initial_end; ///< initial end position of the region + samplepos_t anchored_fade_length; ///< fade_length when anchored during drag boost::shared_ptr initial_playlist; + TimeAxisView* initial_time_axis_view; }; /** Abstract base class for drags that involve region(s) */ @@ -282,9 +329,11 @@ protected: /** a list of the non-hidden TimeAxisViews sorted by editor order key */ std::vector _time_axis_views; int find_time_axis_view (TimeAxisView *) const; + int apply_track_delta (const int start, const int delta, const int skip, const bool distance_only = false) const; int _visible_y_low; int _visible_y_high; + uint32_t _ntracks; friend class DraggingView; @@ -315,14 +364,19 @@ public: protected: - double compute_x_delta (GdkEvent const *, ARDOUR::framepos_t *); - bool y_movement_allowed (int, double) const; + double compute_x_delta (GdkEvent const *, ARDOUR::MusicSample *); + virtual bool y_movement_allowed (int, double, int skip_invisible = 0) const; bool _brushing; - ARDOUR::framepos_t _last_frame_position; ///< last position of the thing being dragged + bool _ignore_video_lock; + ARDOUR::MusicSample _last_position; ///< last position of the thing being dragged double _total_x_delta; int _last_pointer_time_axis_view; double _last_pointer_layer; +private: + uint32_t _ndropzone; + uint32_t _pdropzone; + uint32_t _ddropzone; }; @@ -343,33 +397,39 @@ public: return true; } - std::pair move_threshold () const { + std::pair move_threshold () const { return std::make_pair (4, 4); } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); -private: +protected: typedef std::set > PlaylistSet; + void add_stateful_diff_commands_for_playlists (PlaylistSet const &); +private: void finished_no_copy ( bool const, bool const, - ARDOUR::framecnt_t const + ARDOUR::MusicSample, + int32_t const ev_state ); void finished_copy ( bool const, bool const, - ARDOUR::framecnt_t const + ARDOUR::MusicSample, + int32_t const ev_state ); RegionView* insert_region_into_playlist ( boost::shared_ptr, RouteTimeAxisView*, ARDOUR::layer_t, - ARDOUR::framecnt_t, - PlaylistSet& + ARDOUR::MusicSample, + double quarter_note, + PlaylistSet&, + bool for_music = false ); void remove_region_from_playlist ( @@ -378,10 +438,9 @@ private: PlaylistSet& modified_playlists ); - void add_stateful_diff_commands_for_playlists (PlaylistSet const &); void collect_new_region_view (RegionView *); - RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr); + RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr, TimeAxisView* original); bool _copy; RegionView* _new_region_view; @@ -391,7 +450,7 @@ private: class RegionInsertDrag : public RegionMotionDrag { public: - RegionInsertDrag (Editor *, boost::shared_ptr, RouteTimeAxisView*, ARDOUR::framepos_t); + RegionInsertDrag (Editor *, boost::shared_ptr, RouteTimeAxisView*, ARDOUR::samplepos_t); void finished (GdkEvent *, bool); void aborted (bool); @@ -412,6 +471,48 @@ public: void aborted (bool); }; +/** Region drag in ripple mode */ + +class RegionRippleDrag : public RegionMoveDrag +{ +public: + RegionRippleDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list const &); + ~RegionRippleDrag () { delete exclude; } + + void motion (GdkEvent *, bool); + void finished (GdkEvent *, bool); + void aborted (bool); +protected: + bool y_movement_allowed (int delta_track, double delta_layer, int skip_invisible = 0) const; + +private: + TimeAxisView *prev_tav; // where regions were most recently dragged from + TimeAxisView *orig_tav; // where drag started + ARDOUR::samplecnt_t prev_amount; + ARDOUR::samplepos_t prev_position; + ARDOUR::samplecnt_t selection_length; + bool allow_moves_across_tracks; // only if all selected regions are on one track + ARDOUR::RegionList *exclude; + void add_all_after_to_views (TimeAxisView *tav, ARDOUR::samplepos_t where, const RegionSelection &exclude, bool drag_in_progress); + void remove_unselected_from_views (ARDOUR::samplecnt_t amount, bool move_regions); + +}; + +/** "Drag" to cut a region (action only on button release) */ +class RegionCutDrag : public Drag +{ +public: + RegionCutDrag (Editor*, ArdourCanvas::Item*, samplepos_t); + ~RegionCutDrag (); + + void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void motion (GdkEvent*, bool); + void finished (GdkEvent*, bool); + void aborted (bool); + +private: +}; + /** Drags to create regions */ class RegionCreateDrag : public Drag { @@ -442,12 +543,14 @@ private: MidiRegionView* region; bool relative; bool at_front; + bool _was_selected; + double _snap_delta; }; /** Drags to move MIDI notes */ class NoteDrag : public Drag { - public: +public: NoteDrag (Editor*, ArdourCanvas::Item*); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); @@ -455,17 +558,20 @@ class NoteDrag : public Drag void finished (GdkEvent *, bool); void aborted (bool); - private: + void setup_pointer_sample_offset (); +private: - ARDOUR::frameoffset_t total_dx () const; + double total_dx (GdkEvent * event) const; // total movement in quarter notes int8_t total_dy () const; MidiRegionView* _region; NoteBase* _primary; double _cumulative_dx; double _cumulative_dy; - bool _was_selected; + double _earliest; // earliest quarter note in note selection + bool _was_selected; double _note_height; + bool _copy; }; class NoteCreateDrag : public Drag @@ -479,13 +585,60 @@ public: void finished (GdkEvent *, bool); void aborted (bool); + bool active (Editing::MouseMode mode) { + return mode == Editing::MouseDraw || mode == Editing::MouseContent; + } + + bool y_movement_matters () const { + return false; + } + private: double y_to_region (double) const; - framecnt_t grid_frames (framepos_t) const; - + ARDOUR::samplecnt_t grid_samples (samplepos_t) const; + + /** @return minimum number of samples (in x) and pixels (in y) that should be considered a movement */ + virtual std::pair move_threshold () const { + return std::make_pair (0, 0); + } + MidiRegionView* _region_view; ArdourCanvas::Rectangle* _drag_rect; - framepos_t _note[2]; + samplepos_t _note[2]; +}; + +class HitCreateDrag : public Drag +{ +public: + HitCreateDrag (Editor *, ArdourCanvas::Item *, MidiRegionView *); + ~HitCreateDrag (); + + void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void motion (GdkEvent *, bool); + void finished (GdkEvent *, bool); + void aborted (bool); + + bool active (Editing::MouseMode mode) { + return mode == Editing::MouseDraw || mode == Editing::MouseContent; + } + + bool y_movement_matters () const { + return false; + } + +private: + double y_to_region (double) const; + ARDOUR::samplecnt_t grid_samples (samplepos_t) const; + + /** @return minimum number of samples (in x) and pixels (in y) that should be considered a movement */ + virtual std::pair move_threshold () const { + return std::make_pair (0, 0); + } + + MidiRegionView* _region_view; + samplepos_t _last_pos; + double _y; + }; /** Drag to move MIDI patch changes */ @@ -502,7 +655,7 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: MidiRegionView* _region_view; @@ -517,7 +670,7 @@ public: AVDraggingView (RegionView *); RegionView* view; ///< the view - framepos_t initial_position; ///< initial position of the region + samplepos_t initial_position; ///< initial position of the region }; /** Drag of video offset */ @@ -544,8 +697,9 @@ protected: std::list _views; ///< information about all audio that are being dragged along private: - ARDOUR::frameoffset_t _startdrag_video_offset; - ARDOUR::frameoffset_t _max_backwards_drag; + ARDOUR::sampleoffset_t _startdrag_video_offset; + ARDOUR::sampleoffset_t _max_backwards_drag; + bool _stuck; }; /** Drag to trim region(s) */ @@ -569,12 +723,12 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: Operation _operation; - + bool _preserve_fade_anchor; bool _jump_position_when_done; }; @@ -598,11 +752,15 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: MeterMarker* _marker; + ARDOUR::MeterSection* _real_section; + bool _copy; + Editing::GridType _old_grid_type; + Editing::SnapMode _old_snap_mode; XMLNode* before_state; }; @@ -622,33 +780,120 @@ public: } bool y_movement_matters () const { - return false; + return true; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: TempoMarker* _marker; + ARDOUR::TempoSection* _real_section; + bool _copy; - XMLNode* before_state; + bool _movable; + ARDOUR::Tempo _grab_bpm; + double _grab_qn; + XMLNode* _before_state; }; +/** BBT Ruler drag */ +class BBTRulerDrag : public Drag +{ +public: + BBTRulerDrag (Editor *, ArdourCanvas::Item *); -/** Drag of the playhead cursor */ -class CursorDrag : public Drag + void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void motion (GdkEvent *, bool); + void finished (GdkEvent *, bool); + void aborted (bool); + + bool allow_vertical_autoscroll () const { + return false; + } + + bool y_movement_matters () const { + return false; + } + + void setup_pointer_sample_offset (); + +private: + double _grab_qn; + ARDOUR::TempoSection* _tempo; + XMLNode* _before_state; + bool _drag_valid; +}; + +/** tempo curve twist drag */ +class TempoTwistDrag : public Drag { public: - CursorDrag (Editor *, EditorCursor&, bool); + TempoTwistDrag (Editor *, ArdourCanvas::Item *); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); void motion (GdkEvent *, bool); void finished (GdkEvent *, bool); void aborted (bool); - bool active (Editing::MouseMode) { + bool allow_vertical_autoscroll () const { + return false; + } + + bool y_movement_matters () const { return true; } + void setup_pointer_sample_offset (); + +private: + double _grab_qn; + ARDOUR::Tempo _grab_tempo; + ARDOUR::TempoSection* _tempo; + ARDOUR::TempoSection* _next_tempo; + bool _drag_valid; + XMLNode* _before_state; +}; + + +/** tempo curve twist drag */ +class TempoEndDrag : public Drag +{ +public: + TempoEndDrag (Editor *, ArdourCanvas::Item *); + + void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void motion (GdkEvent *, bool); + void finished (GdkEvent *, bool); + void aborted (bool); + + bool allow_vertical_autoscroll () const { + return false; + } + + bool y_movement_matters () const { + return true; + } + + void setup_pointer_sample_offset (); + +private: + double _grab_qn; + ARDOUR::TempoSection* _tempo; + XMLNode* _before_state; + bool _drag_valid; +}; + +/** Drag of the playhead cursor */ +class CursorDrag : public Drag +{ +public: + CursorDrag (Editor *, EditorCursor&, bool); + + void start_grab (GdkEvent *, Gdk::Cursor* c = 0); + void motion (GdkEvent *, bool); + void finished (GdkEvent *, bool); + void aborted (bool); + bool allow_vertical_autoscroll () const { return false; } @@ -658,11 +903,17 @@ public: } private: - void fake_locate (framepos_t); + void fake_locate (samplepos_t); - EditorCursor& _cursor; + EditorCursor& _cursor; bool _stop; ///< true to stop the transport on starting the drag, otherwise false - double _grab_zoom; ///< editor frames per unit when our grab started + double _grab_zoom; ///< editor samples per unit when our grab started + + //used for zooming + int _last_mx; + int _last_my; + int _last_dx; + int _last_y_delta; }; /** Region fade-in drag */ @@ -680,7 +931,7 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); }; /** Region fade-out drag */ @@ -698,14 +949,14 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); }; /** Marker drag */ class MarkerDrag : public Drag { public: - MarkerDrag (Editor *, ArdourCanvas::Item *); + MarkerDrag (Editor *, ArdourCanvas::Item *); ~MarkerDrag (); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); @@ -721,23 +972,23 @@ public: return false; } - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: void update_item (ARDOUR::Location *); - Marker* _marker; ///< marker being dragged - - struct CopiedLocationMarkerInfo { - ARDOUR::Location* location; - std::vector markers; - bool move_both; - CopiedLocationMarkerInfo (ARDOUR::Location* l, Marker* m); + ArdourMarker* _marker; ///< marker being dragged + bool _selection_changed; + struct CopiedLocationMarkerInfo { + ARDOUR::Location* location; + std::vector markers; + bool move_both; + CopiedLocationMarkerInfo (ARDOUR::Location* l, ArdourMarker* m); }; - typedef std::list CopiedLocationInfo; - CopiedLocationInfo _copied_locations; - ArdourCanvas::Points _points; + typedef std::list CopiedLocationInfo; + CopiedLocationInfo _copied_locations; + ArdourCanvas::Points _points; }; /** Control point drag */ @@ -760,7 +1011,7 @@ private: double _fixed_grab_y; double _cumulative_x_drag; double _cumulative_y_drag; - bool _pushing; + bool _pushing; uint32_t _final_index; static double _zero_gain_fraction; }; @@ -776,18 +1027,14 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - bool active (Editing::MouseMode) { - return true; - } - private: AutomationLine* _line; double _fixed_grab_x; double _fixed_grab_y; + double _cumulative_y_drag; uint32_t _before; uint32_t _after; - double _cumulative_y_drag; }; /** Transient feature line drags*/ @@ -801,10 +1048,6 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - bool active (Editing::MouseMode) { - return true; - } - private: ArdourCanvas::Line* _line; @@ -828,7 +1071,7 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - std::pair move_threshold () const { + std::pair move_threshold () const { return std::make_pair (8, 1); } @@ -836,14 +1079,14 @@ public: /** Select some things within a rectangle. * @param button_state The button state from the GdkEvent. - * @param x1 The left-hand side of the rectangle in session frames. - * @param x2 The right-hand side of the rectangle in session frames. + * @param x1 The left-hand side of the rectangle in session samples. + * @param x2 The right-hand side of the rectangle in session samples. * @param y1 The top of the rectangle in trackview coordinates. * @param y2 The bottom of the rectangle in trackview coordinates. * @param drag_in_progress true if the drag is currently happening. */ - virtual void select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) = 0; - + virtual void select_things (int button_state, samplepos_t x1, samplepos_t x2, double y1, double y2, bool drag_in_progress) = 0; + virtual void deselect_things () = 0; protected: @@ -856,7 +1099,7 @@ class EditorRubberbandSelectDrag : public RubberbandSelectDrag public: EditorRubberbandSelectDrag (Editor *, ArdourCanvas::Item *); - void select_things (int, framepos_t, framepos_t, double, double, bool); + void select_things (int, samplepos_t, samplepos_t, double, double, bool); void deselect_things (); }; @@ -866,7 +1109,7 @@ class MidiRubberbandSelectDrag : public RubberbandSelectDrag public: MidiRubberbandSelectDrag (Editor *, MidiRegionView *); - void select_things (int, framepos_t, framepos_t, double, double, bool); + void select_things (int, samplepos_t, samplepos_t, double, double, bool); void deselect_things (); private: @@ -879,7 +1122,7 @@ class MidiVerticalSelectDrag : public RubberbandSelectDrag public: MidiVerticalSelectDrag (Editor *, MidiRegionView *); - void select_things (int, framepos_t, framepos_t, double, double, bool); + void select_things (int, samplepos_t, samplepos_t, double, double, bool); void deselect_things (); private: @@ -929,18 +1172,15 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - void setup_pointer_frame_offset (); + void setup_pointer_sample_offset (); private: Operation _operation; bool _add; - bool _extend; - int _original_pointer_time_axis; - int _last_pointer_time_axis; - std::list _added_time_axes; + TrackSelection _track_selection_at_start; bool _time_selection_at_start; - framepos_t start_at_start; - framepos_t end_at_start; + samplepos_t start_at_start; + samplepos_t end_at_start; }; /** Range marker drag */ @@ -948,12 +1188,14 @@ class RangeMarkerBarDrag : public Drag { public: enum Operation { + CreateSkipMarker, CreateRangeMarker, CreateTransportMarker, CreateCDMarker }; RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation); + ~RangeMarkerBarDrag (); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); void motion (GdkEvent *, bool); @@ -987,7 +1229,7 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - std::pair move_threshold () const { + std::pair move_threshold () const { return std::make_pair (4, 4); } @@ -1002,7 +1244,7 @@ class AutomationRangeDrag : public Drag { public: AutomationRangeDrag (Editor *, AutomationTimeAxisView *, std::list const &); - AutomationRangeDrag (Editor *, AudioRegionView *, std::list const &); + AutomationRangeDrag (Editor *, RegionView *, std::list const &); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); void motion (GdkEvent *, bool); @@ -1013,13 +1255,10 @@ public: return false; } - bool active (Editing::MouseMode) { - return true; - } - private: void setup (std::list > const &); - double y_fraction (boost::shared_ptr, double global_y_position) const; + double y_fraction (boost::shared_ptr, double global_y_position) const; + double value (boost::shared_ptr list, double x) const; std::list _ranges; @@ -1027,37 +1266,38 @@ private: struct Line { boost::shared_ptr line; ///< the line std::list points; ///< points to drag on the line - std::pair range; ///< the range of all points on the line, in session frames + std::pair range; ///< the range of all points on the line, in session samples XMLNode* state; ///< the XML state node before the drag - double original_fraction; ///< initial y-fraction before the drag + double original_fraction; ///< initial y-fraction before the drag }; std::list _lines; - double y_origin; - bool _nothing_to_drag; + double _y_origin; + bool _nothing_to_drag; + bool _integral; }; /** Drag of one edge of an xfade */ class CrossfadeEdgeDrag : public Drag { - public: +public: CrossfadeEdgeDrag (Editor*, AudioRegionView*, ArdourCanvas::Item*, bool start); void start_grab (GdkEvent*, Gdk::Cursor* c = 0); void motion (GdkEvent*, bool); void finished (GdkEvent*, bool); void aborted (bool); - + bool y_movement_matters () const { return false; } - virtual std::pair move_threshold () const { + virtual std::pair move_threshold () const { return std::make_pair (4, 4); } - private: +private: AudioRegionView* arv; bool start; };