X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=f7b75a5855dee56e32f4991e194bba91b26ccebb;hb=7701207123891b400c144db880b77dc698a202ea;hp=53f1e74232c12af1f58508bb5ee9793ad0dd987e;hpb=e0607ca913bde8f3551cb8e7dc0d3bec5203159c;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 53f1e74232..f7b75a5855 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -44,7 +44,7 @@ #include "canvas/scroll_group.h" #include "editor.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "keyboard.h" #include "audio_region_view.h" #include "automation_region_view.h" @@ -237,6 +237,7 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, bool trackview_only) , _grab_frame (0) , _last_pointer_frame (0) , _snap_delta (0) + , _constraint_pressed (false) { } @@ -261,6 +262,7 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor) { /* we set up x/y dragging constraints on first move */ + _constraint_pressed = ArdourKeyboard::indicates_constraint (event->button.state); _raw_grab_frame = _editor->canvas_event_sample (event, &_grab_x, &_grab_y); @@ -420,14 +422,14 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) if (Config->get_edit_mode() != Lock) { if (event->motion.state & Gdk::BUTTON2_MASK) { // if dragging with button2, the motion is x constrained, with constraint modifier it is y constrained - if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { + if (_constraint_pressed) { _x_constrained = false; _y_constrained = true; } else { _x_constrained = true; _y_constrained = false; } - } else if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { + } else if (_constraint_pressed) { // if dragging normally, the motion is constrained to the first direction of movement. if (_initially_vertical) { _x_constrained = true; @@ -510,7 +512,7 @@ Drag::show_verbose_cursor_text (string const & text) } boost::shared_ptr -Drag::add_midi_region (MidiTimeAxisView* view, bool commit) +Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_num) { if (_editor->session()) { const TempoMap& map (_editor->session()->tempo_map()); @@ -518,19 +520,16 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit) /* not that the frame rate used here can be affected by pull up/down which might be wrong. */ - framecnt_t len = map.frame_at_beat (map.beat_at_frame (pos) + 1.0) - pos; - return view->add_region (grab_frame(), len, commit); + framecnt_t len = map.frame_at_beat (max (0.0, map.beat_at_frame (pos)) + 1.0) - pos; + return view->add_region (grab_frame(), len, commit, sub_num); } return boost::shared_ptr(); } -struct EditorOrderTimeAxisViewSorter { +struct PresentationInfoTimeAxisViewSorter { bool operator() (TimeAxisView* a, TimeAxisView* b) { - RouteTimeAxisView* ra = dynamic_cast (a); - RouteTimeAxisView* rb = dynamic_cast (b); - assert (ra && rb); - return ra->route()->order_key () < rb->route()->order_key (); + return a->stripable()->presentation_info().order() < b->stripable()->presentation_info().order(); } }; @@ -546,7 +545,7 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, listtrack_views; - track_views.sort (EditorOrderTimeAxisViewSorter ()); + track_views.sort (PresentationInfoTimeAxisViewSorter ()); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { _time_axis_views.push_back (*i); @@ -846,7 +845,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) RouteTimeAxisView* rtv = dynamic_cast (tv); if (!rtv || !rtv->is_track()) { - /* ignore busses early on. we can't move any regions on them */ + /* ignore non-tracks early on. we can't move any regions on them */ } else if (_last_pointer_time_axis_view < 0) { /* Was in the drop-zone, now over a track. * Hence it must be an upward move (from the bottom) @@ -1259,8 +1258,8 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) MidiRegionView* mrv = dynamic_cast(rv); const boost::shared_ptr original = rv->region(); - boost::shared_ptr region_copy = RegionFactory::create (original, true); - region_copy->set_position (original->position()); + boost::shared_ptr region_copy = RegionFactory::create (original, true + , _editor->get_grid_music_divisions (event->button.state)); /* need to set this so that the drop zone code can work. This doesn't actually put the region into the playlist, but just sets a weak pointer to it. @@ -1367,7 +1366,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) finished_copy ( changed_position, changed_tracks, - drag_delta + drag_delta, + ev->button.state ); } else { @@ -1375,7 +1375,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) finished_no_copy ( changed_position, changed_tracks, - drag_delta + drag_delta, + ev->button.state ); } @@ -1397,21 +1398,23 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) { output_chan = _editor->session()->master_out()->n_inputs().n_audio(); } - audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name()); - RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front()); - if (rtav) { - rtav->set_height (original->current_height()); + audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); + TimeAxisView* tav =_editor->axis_view_from_stripable (audio_tracks.front()); + if (tav) { + tav->set_height (original->current_height()); } - return rtav; + return dynamic_cast(tav); } else { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; - midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), ARDOUR::Normal, 0, 1, region->name()); - RouteTimeAxisView* rtav = _editor->axis_view_from_route (midi_tracks.front()); - if (rtav) { - rtav->set_height (original->current_height()); + midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); + TimeAxisView* tav = _editor->axis_view_from_stripable (midi_tracks.front()); + if (tav) { + tav->set_height (original->current_height()); } - return rtav; + return dynamic_cast (tav); } } catch (...) { error << _("Could not create new track after region placed in the drop zone") << endmsg; @@ -1420,7 +1423,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, } void -RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta) +RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta, int32_t const ev_state) { RegionSelection new_views; PlaylistSet modified_playlists; @@ -1477,7 +1480,9 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed } if (dest_rtv != 0) { - RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, modified_playlists); + RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, + modified_playlists, _editor->get_grid_music_divisions (ev_state)); + if (new_view != 0) { new_views.push_back (new_view); } @@ -1511,7 +1516,8 @@ void RegionMoveDrag::finished_no_copy ( bool const changed_position, bool const changed_tracks, - framecnt_t const drag_delta + framecnt_t const drag_delta, + int32_t const ev_state ) { RegionSelection new_views; @@ -1572,7 +1578,8 @@ RegionMoveDrag::finished_no_copy ( /* insert into new playlist */ RegionView* new_view = insert_region_into_playlist ( - RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, + modified_playlists, _editor->get_grid_music_divisions (ev_state) ); if (new_view == 0) { @@ -1632,7 +1639,7 @@ RegionMoveDrag::finished_no_copy ( playlist->freeze (); } - rv->region()->set_position (where); + rv->region()->set_position (where, _editor->get_grid_music_divisions (ev_state)); _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } @@ -1735,7 +1742,8 @@ RegionMoveDrag::insert_region_into_playlist ( RouteTimeAxisView* dest_rtv, layer_t dest_layer, framecnt_t where, - PlaylistSet& modified_playlists + PlaylistSet& modified_playlists, + const int32_t sub_num ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); @@ -1752,8 +1760,7 @@ RegionMoveDrag::insert_region_into_playlist ( if (r.second) { dest_playlist->clear_changes (); } - - dest_playlist->add_region (region, where); + dest_playlist->add_region (region, where, 1.0, false, sub_num); if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { dest_playlist->set_layer (region, dest_layer); @@ -1877,7 +1884,7 @@ RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, Rout } void -RegionInsertDrag::finished (GdkEvent *, bool) +RegionInsertDrag::finished (GdkEvent * event, bool) { int pos = _views.front().time_axis_view; assert(pos >= 0 && pos < (int)_time_axis_views.size()); @@ -2304,7 +2311,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move) { if (first_move) { _editor->begin_reversible_command (_("create region")); - _region = add_midi_region (_view, false); + _region = add_midi_region (_view, false, _editor->get_grid_music_divisions (event->button.state)); _view->playlist()->freeze (); } else { if (_region) { @@ -2321,16 +2328,16 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move) */ framecnt_t const len = (framecnt_t) fabs ((double)(f - grab_frame () - 1)); - _region->set_length (len < 1 ? 1 : len); + _region->set_length (len < 1 ? 1 : len, _editor->get_grid_music_divisions (event->button.state)); } } } void -RegionCreateDrag::finished (GdkEvent*, bool movement_occurred) +RegionCreateDrag::finished (GdkEvent* event, bool movement_occurred) { if (!movement_occurred) { - add_midi_region (_view, true); + add_midi_region (_view, true, _editor->get_grid_music_divisions (event->button.state)); } else { _view->playlist()->thaw (); _editor->commit_reversible_command(); @@ -2851,7 +2858,6 @@ TrimDrag::motion (GdkEvent* event, bool first_move) for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { RegionView* rv = i->view; - rv->enable_display (false); rv->region()->playlist()->clear_owned_changes (); if (_operation == StartTrim) { @@ -2912,7 +2918,9 @@ TrimDrag::motion (GdkEvent* event, bool first_move) switch (_operation) { case StartTrim: for (list::iterator i = _views.begin(); i != _views.end(); ++i) { - bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim); + bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim + , _editor->get_grid_music_divisions (event->button.state)); + if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -2930,7 +2938,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) case EndTrim: for (list::iterator i = _views.begin(); i != _views.end(); ++i) { - bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim); + bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, _editor->get_grid_music_divisions (event->button.state)); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -3079,10 +3087,11 @@ TrimDrag::aborted (bool movement_occurred) behind which may be slightly odd from the user's point of view. */ - finished (0, true); + GdkEvent ev; + finished (&ev, true); if (movement_occurred) { - _editor->undo (); + _editor->session()->undo (1); } for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3115,8 +3124,10 @@ TrimDrag::setup_pointer_frame_offset () } MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) - : Drag (e, i), - _copy (c) + : Drag (e, i) + , _copy (c) + , _old_snap_type (e->snap_type()) + , _old_snap_mode (e->snap_mode()) , before_state (0) { DEBUG_TRACE (DEBUG::Drags, "New MeterMarkerDrag\n"); @@ -3142,12 +3153,7 @@ MeterMarkerDrag::setup_pointer_frame_offset () void MeterMarkerDrag::motion (GdkEvent* event, bool first_move) { - if (!_marker->meter().movable()) { - //return; - } - if (first_move) { - // create a dummy marker to catch events, then hide it. char name[64]; @@ -3182,43 +3188,34 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) } else { --bbt.bars; } - const double beat = map.bbt_to_beats (bbt); - - if (_real_section->position_lock_style() == AudioTime) { - _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) - , map.frame_time (bbt), beat, bbt); - } else { - _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()), beat, bbt); + const double beat = map.beat_at_bbt (bbt); + _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) + , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style()); + if (!_real_section) { + aborted (true); + return; } - } - } - framepos_t const pf = adjusted_current_frame (event, false); - if (_marker->meter().position_lock_style() == MusicTime) { - TempoMap& map (_editor->session()->tempo_map()); - Timecode::BBT_Time bbt; - map.bbt_time (pf, bbt); - /* round bbt to bars */ - map.round_bbt (bbt, -1); - - if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { - _editor->session()->tempo_map().gui_dilate_tempo (_real_section, pf); - } else if (bbt.bars > _real_section->bbt().bars) { - const double pulse = _real_section->pulse() + (_real_section->note_divisor() / _real_section->divisions_per_bar()); - _editor->session()->tempo_map().gui_move_meter (_real_section, pulse); - } else if (bbt.bars < _real_section->bbt().bars) { - const MeterSection& prev_m = map.meter_section_at (pf); - const double pulse = _real_section->pulse() - (prev_m.note_divisor() / prev_m.divisions_per_bar()); - _editor->session()->tempo_map().gui_move_meter (_real_section, pulse); } - } else { - if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { - _editor->session()->tempo_map().gui_dilate_tempo (_real_section, pf); - } else { - _editor->session()->tempo_map().gui_move_meter (_real_section, pf); + /* only snap to bars. leave snap mode alone for audio locked meters.*/ + if (_real_section->position_lock_style() != AudioTime) { + _editor->set_snap_to (SnapToBar); + _editor->set_snap_mode (SnapNormal); } } - _marker->set_position (pf); + + framepos_t pf = adjusted_current_frame (event); + + if (_real_section->position_lock_style() == AudioTime && _editor->snap_musical()) { + /* never snap to music for audio locked */ + pf = adjusted_current_frame (event, false); + } + + _editor->session()->tempo_map().gui_move_meter (_real_section, pf); + + /* fake marker meeds to stay under the mouse, unlike the real one. */ + _marker->set_position (adjusted_current_frame (event, false)); + show_verbose_cursor_time (_real_section->frame()); } @@ -3232,6 +3229,10 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred) return; } + /* reinstate old snap setting */ + _editor->set_snap_to (_old_snap_type); + _editor->set_snap_mode (_old_snap_mode); + TempoMap& map (_editor->session()->tempo_map()); XMLNode &after = map.get_state(); @@ -3248,6 +3249,10 @@ MeterMarkerDrag::aborted (bool moved) { _marker->set_position (_marker->meter().frame ()); if (moved) { + /* reinstate old snap setting */ + _editor->set_snap_to (_old_snap_type); + _editor->set_snap_mode (_old_snap_mode); + _editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version); // delete the dummy marker we used for visual representation while moving. // a new visual marker will show up automatically. @@ -3282,7 +3287,7 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) void TempoMarkerDrag::setup_pointer_frame_offset () { - _pointer_frame_offset = raw_grab_frame() - _marker->tempo().frame(); + _pointer_frame_offset = raw_grab_frame() - _real_section->frame(); } void @@ -3291,6 +3296,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) if (!_real_section->active()) { return; } + if (first_move) { // mvc drag - create a dummy marker to catch events, hide it. @@ -3315,126 +3321,62 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) TempoMap& map (_editor->session()->tempo_map()); /* get current state */ before_state = &map.get_state(); + if (!_copy) { _editor->begin_reversible_command (_("move tempo mark")); + } else { + const Tempo tempo (_marker->tempo()); + const framepos_t frame = adjusted_current_frame (event) + 1; + const TempoSection::Type type = _real_section->type(); + _editor->begin_reversible_command (_("copy tempo mark")); - framepos_t frame; - bool use_snap = false; - if (!_editor->snap_musical()) { - frame = adjusted_current_frame (event); + if (_real_section->position_lock_style() == MusicTime) { + _real_section = map.add_tempo (tempo, map.pulse_at_frame (frame), 0, type, MusicTime); } else { - frame = adjusted_current_frame (event, false); - if (ArdourKeyboard::indicates_snap (event->button.state)) { - if (_editor->snap_mode() == Editing::SnapOff) { - use_snap = true; - } else { - use_snap = false; - } - } else { - if (_editor->snap_mode() == Editing::SnapOff) { - use_snap = false; - } else { - use_snap = true; - } - } + _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime); } - Timecode::BBT_Time bbt; - map.bbt_time (frame, bbt); - - /* add new tempo section to map, ensuring we don't refer to existing tempos for snap */ - - if (_real_section->position_lock_style() == MusicTime) { - if (use_snap && _editor->snap_type() == SnapToBar) { - map.round_bbt (bbt, -1); - } else if (use_snap) { - map.round_bbt (bbt, _editor->get_grid_beat_divisions (0)); - } - double const pulse = map.predict_tempo_pulse (_real_section, map.frame_time (bbt)); - _real_section = map.add_tempo (_marker->tempo(), pulse, _real_section->type()); - } else { - if (use_snap && _editor->snap_type() == SnapToBar) { - map.round_bbt (bbt, -1); - } else if (use_snap) { - map.round_bbt (bbt, _editor->get_grid_beat_divisions (0)); - } - if (use_snap) { - frame = map.predict_tempo_frame (_real_section, bbt); - } - _real_section = map.add_tempo (_marker->tempo(), frame, _real_section->type()); + if (!_real_section) { + aborted (true); + return; } } } - framepos_t pf; - Tempo const tp = _marker->tempo(); - if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { + if (ArdourKeyboard::indicates_constraint (event->button.state)) { + /* use vertical movement to alter tempo .. should be log */ double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0); - _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type())); stringstream strs; + + _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type())); strs << new_bpm; show_verbose_cursor_text (strs.str()); - } else if (_movable) { - if (!_editor->snap_musical()) { - /* snap normally (this is not self-referential).*/ - pf = adjusted_current_frame (event); - } else { - /* but this is. - we can't use the map for anything related to tempo, - so we round bbt using meters, which have no dependency - on pulse for this kind of thing. - */ - bool use_snap; - TempoMap& map (_editor->session()->tempo_map()); + } else if (_movable && !_real_section->locked_to_meter()) { + framepos_t pf; + + if (_editor->snap_musical()) { + /* we can't snap to a grid that we are about to move. + * gui_move_tempo() will sort out snap using the supplied beat divisions. + */ pf = adjusted_current_frame (event, false); - if (ArdourKeyboard::indicates_snap (event->button.state)) { - if (_editor->snap_mode() == Editing::SnapOff) { - use_snap = true; - } else { - use_snap = false; - } - } else { - if (_editor->snap_mode() == Editing::SnapOff) { - use_snap = false; - } else { - use_snap = true; - } - } + } else { + pf = adjusted_current_frame (event); + } - Timecode::BBT_Time when; - map.bbt_time (pf, when); + TempoMap& map (_editor->session()->tempo_map()); - if (_real_section->position_lock_style() == MusicTime) { + /* snap to beat is 1, snap to bar is -1 (sorry) */ + const int sub_num = _editor->get_grid_music_divisions (event->button.state); - const double pulse = map.predict_tempo_pulse (_real_section, pf); - when = map.pulse_to_bbt (pulse); - if (use_snap && _editor->snap_type() == SnapToBar) { - map.round_bbt (when, -1); - } else if (use_snap) { - map.round_bbt (when, _editor->get_grid_beat_divisions (0)); - } - const double beat = map.bbt_to_beats (when); - map.gui_move_tempo_beat (_real_section, beat); - } else { - if (use_snap && _editor->snap_type() == SnapToBar) { - map.round_bbt (when, -1); - } else if (use_snap) { - map.round_bbt (when, _editor->get_grid_beat_divisions (0)); - } - if (use_snap) { - pf = map.predict_tempo_frame (_real_section, when); - } - map.gui_move_tempo_frame (_real_section, pf); - } - } + map.gui_move_tempo (_real_section, pf, sub_num); show_verbose_cursor_time (_real_section->frame()); } - _marker->set_position (pf); + _marker->set_position (adjusted_current_frame (event, false)); } void @@ -3468,12 +3410,111 @@ TempoMarkerDrag::aborted (bool moved) if (moved) { TempoMap& map (_editor->session()->tempo_map()); map.set_state (*before_state, Stateful::current_state_version); - // delete the dummy marker we used for visual representation while moving. - // a new visual marker will show up automatically. + // delete the dummy (hidden) marker we used for events while moving. delete _marker; } } +BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i) + : Drag (e, i) + , _pulse (0.0) + , _tempo (0) + , before_state (0) +{ + DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n"); + +} + +void +BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + TempoMap& map (_editor->session()->tempo_map()); + _tempo = const_cast (&map.tempo_section_at_frame (raw_grab_frame())); + ostringstream sstr; + + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + show_verbose_cursor_text (sstr.str()); + finished (event, false); +} + +void +BBTRulerDrag::setup_pointer_frame_offset () +{ + TempoMap& map (_editor->session()->tempo_map()); + const double beat_at_frame = max (0.0, map.beat_at_frame (raw_grab_frame())); + const uint32_t divisions = _editor->get_grid_beat_divisions (0); + double beat = 0.0; + + if (divisions > 0) { + beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * divisions)) / divisions); + } else { + /* while it makes some sense for the user to determine the division to 'grab', + grabbing a bar often leads to confusing results wrt the actual tempo section being altered + and the result over steep tempo curves. Use sixteenths. + */ + beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4); + } + + _pulse = map.pulse_at_beat (beat); + + _pointer_frame_offset = raw_grab_frame() - map.frame_at_pulse (_pulse); + +} + +void +BBTRulerDrag::motion (GdkEvent* event, bool first_move) +{ + TempoMap& map (_editor->session()->tempo_map()); + + if (first_move) { + /* get current state */ + before_state = &map.get_state(); + _editor->begin_reversible_command (_("dilate tempo")); + } + + framepos_t pf; + + if (_editor->snap_musical()) { + pf = adjusted_current_frame (event, false); + } else { + pf = adjusted_current_frame (event); + } + + if (ArdourKeyboard::indicates_constraint (event->button.state)) { + /* adjust previous tempo to match pointer frame */ + _editor->session()->tempo_map().gui_dilate_tempo (_tempo, map.frame_at_pulse (_pulse), pf, _pulse); + } + ostringstream sstr; + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).beats_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + show_verbose_cursor_text (sstr.str()); +} + +void +BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred) +{ + if (!movement_occurred) { + return; + } + + TempoMap& map (_editor->session()->tempo_map()); + + XMLNode &after = map.get_state(); + _editor->session()->add_command(new MementoCommand(map, before_state, &after)); + _editor->commit_reversible_command (); +} + +void +BBTRulerDrag::aborted (bool moved) +{ + if (moved) { + _editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version); + } +} + + CursorDrag::CursorDrag (Editor* e, EditorCursor& c, bool s) : Drag (e, &c.track_canvas_item(), false) , _cursor (c) @@ -4215,6 +4256,10 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred) } else { location->set (((*x).location)->start(), ((*x).location)->end()); } + + if (location->is_session_range()) { + _editor->session()->set_end_is_free (false); + } } } @@ -4746,7 +4791,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred) /* MIDI track */ if (_editor->selection->empty() && _editor->mouse_mode == MouseDraw) { /* nothing selected */ - add_midi_region (mtv, true); + add_midi_region (mtv, true, _editor->get_grid_music_divisions(event->button.state)); do_deselect = false; } } @@ -5073,7 +5118,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) TrackViewList grouped_add = new_selection; for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) { RouteTimeAxisView *n = dynamic_cast(*i); - if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::select.property_id) ) { + if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::group_select.property_id) ) { for (TrackViewList::const_iterator j = all_tracks.begin(); j != all_tracks.end(); ++j) { RouteTimeAxisView *check = dynamic_cast(*j); if ( check && (n != check) && (check->route()->route_group() == n->route()->route_group()) ) @@ -5530,11 +5575,17 @@ NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *) frameoffset_t NoteDrag::total_dx (const guint state) const { + if (_x_constrained) { + return 0; + } + TempoMap& map (_editor->session()->tempo_map()); + /* dx in frames */ frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x()); /* primary note time */ - frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ()); + double const quarter_note_start = map.quarter_note_at_beat (_region->region()->beat() - _region->midi_region()->start_beats().to_double()); + frameoffset_t const n = map.frame_at_quarter_note (quarter_note_start + _primary->note()->time().to_double()); /* new time of the primary note in session frames */ frameoffset_t st = n + dx + snap_delta (state); @@ -5576,6 +5627,10 @@ NoteDrag::total_dx (const guint state) const int8_t NoteDrag::total_dy () const { + if (_y_constrained) { + return 0; + } + MidiStreamView* msv = _region->midi_stream_view (); double const y = _region->midi_view()->y_position (); /* new current note */ @@ -5595,8 +5650,8 @@ NoteDrag::motion (GdkEvent * event, bool) int8_t const dy = total_dy (); /* Now work out what we have to do to the note canvas items to set this new drag delta */ - double const tdx = _editor->sample_to_pixel (dx) - _cumulative_dx; - double const tdy = -dy * _note_height - _cumulative_dy; + double const tdx = _x_constrained ? 0 : _editor->sample_to_pixel (dx) - _cumulative_dx; + double const tdy = _y_constrained ? 0 : -dy * _note_height - _cumulative_dy; if (tdx || tdy) { _cumulative_dx += tdx; @@ -5604,17 +5659,19 @@ NoteDrag::motion (GdkEvent * event, bool) int8_t note_delta = total_dy(); - _region->move_selection (tdx, tdy, note_delta); + if (tdx || tdy) { + _region->move_selection (tdx, tdy, note_delta); - /* the new note value may be the same as the old one, but we - * don't know what that means because the selection may have - * involved more than one note and we might be doing something - * odd with them. so show the note value anyway, always. - */ + /* the new note value may be the same as the old one, but we + * don't know what that means because the selection may have + * involved more than one note and we might be doing something + * odd with them. so show the note value anyway, always. + */ - uint8_t new_note = min (max (_primary->note()->note() + note_delta, 0), 127); + uint8_t new_note = min (max (_primary->note()->note() + note_delta, 0), 127); - _region->show_verbose_cursor_for_new_note_value (_primary->note(), new_note); + _region->show_verbose_cursor_for_new_note_value (_primary->note(), new_note); + } } } @@ -5981,6 +6038,9 @@ void PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred) { if (!movement_occurred) { + if (was_double_click()) { + _region_view->edit_patch_change (_patch_change); + } return; } @@ -6125,18 +6185,33 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Drag::start_grab (event, cursor); _drag_rect = new ArdourCanvas::Rectangle (_region_view->get_canvas_group ()); + TempoMap& map (_editor->session()->tempo_map()); - framepos_t pf = _drags->current_pointer_frame (); - framecnt_t const g = grid_frames (pf); + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); - /* Hack so that we always snap to the note that we are over, instead of snapping - to the next one if we're more than halfway through the one we're over. - */ - if (_editor->snap_mode() == SnapNormal && pf > g / 2) { - pf -= g / 2; + double eqaf = map.exact_qn_at_frame (pf, divisions); + + if (divisions != 0) { + bool success = false; + Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf); + if (!success) { + grid_beats = Evoral::Beats(1); + } + + const double qaf = map.quarter_note_at_frame (pf); + + /* Hack so that we always snap to the note that we are over, instead of snapping + to the next one if we're more than halfway through the one we're over. + */ + + const double rem = eqaf - qaf; + if (rem >= 0.0 && eqaf - grid_beats.to_double() > _region_view->region()->pulse() * 4.0) { + eqaf -= grid_beats.to_double(); + } } - _note[0] = adjusted_frame (pf, event) - _region_view->region()->position (); + _note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); _note[1] = _note[0]; MidiStreamView* sv = _region_view->midi_stream_view (); @@ -6160,26 +6235,28 @@ NoteCreateDrag::motion (GdkEvent* event, bool) } void -NoteCreateDrag::finished (GdkEvent*, bool had_movement) +NoteCreateDrag::finished (GdkEvent* ev, bool had_movement) { if (!had_movement) { return; } framepos_t const start = min (_note[0], _note[1]); + framepos_t const start_sess_rel = start + _region_view->region()->position(); framecnt_t length = (framecnt_t) fabs ((double)(_note[0] - _note[1])); framecnt_t const g = grid_frames (start); Evoral::Beats const one_tick = Evoral::Beats::ticks(1); - if (_editor->snap_mode() == SnapNormal && length < g) { + if (_editor->get_grid_music_divisions (ev->button.state) != 0 && length < g) { length = g; } - Evoral::Beats length_beats = max ( - one_tick, _region_view->region_frames_to_region_beats (length) - one_tick); + TempoMap& map (_editor->session()->tempo_map()); + const double qn_length = map.quarter_note_at_frame (start_sess_rel + length) - map.quarter_note_at_frame (start_sess_rel); - _region_view->create_note_at (start, _drag_rect->y0(), length_beats, false); + Evoral::Beats qn_length_beats = max (one_tick, Evoral::Beats (qn_length)); + _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false); } double @@ -6315,7 +6392,7 @@ RegionCutDrag::motion (GdkEvent*, bool) } void -RegionCutDrag::finished (GdkEvent*, bool) +RegionCutDrag::finished (GdkEvent* event, bool) { _editor->get_track_canvas()->canvas()->re_enter(); @@ -6329,7 +6406,7 @@ RegionCutDrag::finished (GdkEvent*, bool) return; } - _editor->split_regions_at (pos, rs); + _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state)); } void