X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=c62151fc280eff01fd9ba04f3406c30ed1d166e7;hb=c59dded55d13486f7b8be0f026cb0e8d17aa5d02;hp=ca07c5ffbb6792e2b00ee65a9df877ba37bd833c;hpb=0d17c21410bc4b4333ec4d8e50d603dde692dce9;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index ca07c5ffbb..c62151fc28 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -37,6 +37,7 @@ #include "ardour/midi_region.h" #include "ardour/midi_track.h" #include "ardour/operations.h" +#include "ardour/profile.h" #include "ardour/region_factory.h" #include "ardour/session.h" @@ -44,7 +45,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 +238,8 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, bool trackview_only) , _grab_frame (0) , _last_pointer_frame (0) , _snap_delta (0) + , _snap_delta_music (0.0) + , _constraint_pressed (false) { } @@ -261,11 +264,12 @@ 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); setup_pointer_frame_offset (); - _grab_frame = adjusted_frame (_raw_grab_frame, event); + _grab_frame = adjusted_frame (_raw_grab_frame, event).frame; _last_pointer_frame = _grab_frame; _last_pointer_x = _grab_x; @@ -321,13 +325,13 @@ Drag::end_grab (GdkEvent* event) return _move_threshold_passed; } -framepos_t +MusicFrame Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const { - framepos_t pos = 0; + MusicFrame pos (0, 0); if (f > _pointer_frame_offset) { - pos = f - _pointer_frame_offset; + pos.frame = f - _pointer_frame_offset; } if (snap) { @@ -340,7 +344,7 @@ Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const framepos_t Drag::adjusted_current_frame (GdkEvent const * event, bool snap) const { - return adjusted_frame (_drags->current_pointer_frame (), event, snap); + return adjusted_frame (_drags->current_pointer_frame (), event, snap).frame; } frameoffset_t @@ -352,6 +356,15 @@ Drag::snap_delta (guint state) const return 0; } +double +Drag::snap_delta_music (guint state) const +{ + if (ArdourKeyboard::indicates_snap_delta (state)) { + return _snap_delta_music; + } + + return 0.0; +} double Drag::current_pointer_x() const @@ -370,11 +383,18 @@ Drag::current_pointer_y () const } void -Drag::setup_snap_delta (framepos_t pos) +Drag::setup_snap_delta (MusicFrame pos) { - framepos_t temp = pos; - _editor->snap_to (temp, ARDOUR::RoundNearest, false, true); - _snap_delta = temp - pos; + TempoMap& map (_editor->session()->tempo_map()); + MusicFrame snap (pos); + _editor->snap_to (snap, ARDOUR::RoundNearest, false, true); + _snap_delta = snap.frame - pos.frame; + + _snap_delta_music = 0.0; + + if (_snap_delta != 0) { + _snap_delta_music = map.exact_qn_at_frame (snap.frame, snap.division) - map.exact_qn_at_frame (pos.frame, pos.division); + } } bool @@ -420,14 +440,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; @@ -518,19 +538,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; + 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); } 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 +563,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); @@ -603,6 +620,7 @@ RegionMotionDrag::RegionMotionDrag (Editor* e, ArdourCanvas::Item* i, RegionView : RegionDrag (e, i, p, v) , _brushing (b) , _ignore_video_lock (false) + , _last_position (0, 0) , _total_x_delta (0) , _last_pointer_time_axis_view (0) , _last_pointer_layer (0) @@ -617,9 +635,9 @@ void RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Drag::start_grab (event, cursor); - setup_snap_delta (_last_frame_position); + setup_snap_delta (_last_position); - show_verbose_cursor_time (_last_frame_position); + show_verbose_cursor_time (_last_position.frame); pair const tv = _editor->trackview_by_y_position (current_pointer_y ()); if (tv.first) { @@ -639,14 +657,13 @@ RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } double -RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_region_position) +RegionMotionDrag::compute_x_delta (GdkEvent const * event, MusicFrame* pending_region_position) { /* compute the amount of pointer motion in frames, and where the region would be if we moved it by that much. */ *pending_region_position = adjusted_frame (_drags->current_pointer_frame (), event, false); - framepos_t sync_frame; framecnt_t sync_offset; int32_t sync_dir; @@ -654,47 +671,44 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r /* we don't handle a sync point that lies before zero. */ - if (sync_dir >= 0 || (sync_dir < 0 && *pending_region_position >= sync_offset)) { + if (sync_dir >= 0 || (sync_dir < 0 && pending_region_position->frame >= sync_offset)) { framecnt_t const sd = snap_delta (event->button.state); - sync_frame = *pending_region_position + (sync_dir * sync_offset) + sd; - - _editor->snap_to_with_modifier (sync_frame, event); - - *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - sd; - + MusicFrame sync_snap (pending_region_position->frame + (sync_dir * sync_offset) + sd, 0); + _editor->snap_to_with_modifier (sync_snap, event); + if (sync_offset == 0 && sd == 0) { + *pending_region_position = sync_snap; + } else { + pending_region_position->set (_primary->region()->adjust_to_sync (sync_snap.frame) - sd, 0); + } } else { - *pending_region_position = _last_frame_position; + *pending_region_position = _last_position; } - if (*pending_region_position > max_framepos - _primary->region()->length()) { - *pending_region_position = _last_frame_position; + if (pending_region_position->frame > max_framepos - _primary->region()->length()) { + *pending_region_position = _last_position; } double dx = 0; bool const x_move_allowed = !_x_constrained; - if ((*pending_region_position != _last_frame_position) && x_move_allowed) { + if ((pending_region_position->frame != _last_position.frame) && x_move_allowed) { /* x movement since last time (in pixels) */ - dx = (static_cast (*pending_region_position) - _last_frame_position) / _editor->samples_per_pixel; + dx = _editor->sample_to_pixel_unrounded (pending_region_position->frame - _last_position.frame); /* total x movement */ - framecnt_t total_dx = *pending_region_position; - if (regions_came_from_canvas()) { - total_dx = total_dx - grab_frame (); - } + framecnt_t total_dx = _editor->pixel_to_sample (_total_x_delta + dx); - /* check that no regions have gone off the start of the session */ for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - if ((i->view->region()->position() + total_dx) < 0) { - dx = 0; - *pending_region_position = _last_frame_position; + frameoffset_t const off = i->view->region()->position() + total_dx; + if (off < 0) { + dx = dx - _editor->sample_to_pixel_unrounded (off); + *pending_region_position = MusicFrame (pending_region_position->frame - off, 0); break; } } - } return dx; @@ -846,7 +860,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) @@ -931,9 +945,14 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) } /* Work out the change in x */ - framepos_t pending_region_position; + TempoMap& tmap = _editor->session()->tempo_map(); + MusicFrame pending_region_position (0, 0); double const x_delta = compute_x_delta (event, &pending_region_position); - _last_frame_position = pending_region_position; + + double const last_pos_qn = tmap.exact_qn_at_frame (_last_position.frame, _last_position.division); + double const qn_delta = tmap.exact_qn_at_frame (pending_region_position.frame, pending_region_position.division) - last_pos_qn; + + _last_position = pending_region_position; /* calculate hidden tracks in current y-axis delta */ int delta_skip = 0; @@ -1100,6 +1119,10 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) y_delta = yposition - rv->get_canvas_group()->canvas_origin().y; } + MidiRegionView* mrv = dynamic_cast(rv); + if (mrv) { + mrv->apply_note_range (60, 71, true); + } } else { /* The TimeAxisView that this region is now over */ @@ -1132,7 +1155,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) i->layer += this_delta_layer; if (_brushing) { - _editor->mouse_brush_insert_region (rv, pending_region_position); + _editor->mouse_brush_insert_region (rv, pending_region_position.frame); } else { Duple track_origin; @@ -1161,17 +1184,33 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) y_delta = track_origin.y - rv->get_canvas_group()->canvas_origin().y; } + + MidiRegionView* mrv = dynamic_cast(rv); + if (mrv) { + MidiStreamView* msv; + if ((msv = dynamic_cast (current_tv->view())) != 0) { + mrv->apply_note_range (msv->lowest_note(), msv->highest_note(), true); + } + } } /* Now move the region view */ - rv->move (x_delta, y_delta); + if (rv->region()->position_lock_style() == MusicTime) { + double const last_qn = tmap.quarter_note_at_frame (rv->get_position()); + framepos_t const x_pos_music = tmap.frame_at_quarter_note (last_qn + qn_delta); + + rv->set_position (x_pos_music, 0); + rv->move (0, y_delta); + } else { + rv->move (x_delta, y_delta); + } } /* foreach region */ _total_x_delta += x_delta; if (x_delta != 0 && !_brushing) { - show_verbose_cursor_time (_last_frame_position); + show_verbose_cursor_time (_last_position.frame); } /* keep track of pointer movement */ @@ -1259,8 +1298,10 @@ 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; + + region_copy = RegionFactory::create (original, true); + /* 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. @@ -1341,8 +1382,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) if (was_double_click() && !_views.empty()) { DraggingView dv = _views.front(); - dv.view->show_region_editor (); - + _editor->edit_region (dv.view); } return; @@ -1358,16 +1398,16 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) i->view->get_canvas_group()->show (); } - bool const changed_position = (_last_frame_position != _primary->region()->position()); + bool const changed_position = (_last_position.frame != _primary->region()->position()); bool const changed_tracks = (_time_axis_views[_views.front().time_axis_view] != &_views.front().view->get_time_axis_view()); - framecnt_t const drag_delta = _primary->region()->position() - _last_frame_position; if (_copy) { finished_copy ( changed_position, changed_tracks, - drag_delta + _last_position, + ev->button.state ); } else { @@ -1375,12 +1415,11 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) finished_no_copy ( changed_position, changed_tracks, - drag_delta + _last_position, + ev->button.state ); } - - _editor->maybe_locate_with_edit_preroll (_editor->get_selection().regions.start()); } RouteTimeAxisView* @@ -1389,7 +1428,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, /* Add a new track of the correct type, and return the RouteTimeAxisView that is created to display the new track. */ - + TimeAxisView* tav = 0; try { if (boost::dynamic_pointer_cast (region)) { list > audio_tracks; @@ -1397,34 +1436,40 @@ 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()); - } - return rtav; + audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); + tav =_editor->axis_view_from_stripable (audio_tracks.front()); } 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()); - } - return rtav; + midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, + Config->get_strict_io () || Profile->get_mixbus (), + boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); + tav = _editor->axis_view_from_stripable (midi_tracks.front()); + } + + if (tav) { + tav->set_height (original->current_height()); } } catch (...) { error << _("Could not create new track after region placed in the drop zone") << endmsg; - return 0; } + + return dynamic_cast (tav); } 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*/, MusicFrame last_position, int32_t const ev_state) { RegionSelection new_views; PlaylistSet modified_playlists; RouteTimeAxisView* new_time_axis_view = 0; + framecnt_t const drag_delta = _primary->region()->position() - _last_position.frame; + + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_frame (last_position.frame, last_position.division); + const double qn_delta = _primary->region()->quarter_note() - last_pos_qn; if (_brushing) { /* all changes were made during motion event handlers */ @@ -1449,12 +1494,16 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed continue; } - framepos_t where; + MusicFrame where (0, 0); + double quarter_note; if (changed_position && !_x_constrained) { - where = i->view->region()->position() - drag_delta; + where.set (i->view->region()->position() - drag_delta, 0); + quarter_note = i->view->region()->quarter_note() - qn_delta; } else { - where = i->view->region()->position(); + /* region has not moved - divisor will not affect musical pos */ + where.set (i->view->region()->position(), 0); + quarter_note = i->view->region()->quarter_note(); } if (i->time_axis_view < 0 || i->time_axis_view >= (int)_time_axis_views.size()) { @@ -1465,6 +1514,10 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed if ((pm = playlist_mapping.find (i->view->region()->playlist())) == playlist_mapping.end()) { /* first region from this original playlist: create a new track */ new_time_axis_view = create_destination_time_axis (i->view->region(), i->initial_time_axis_view); + if(!new_time_axis_view) { + Drag::abort(); + return; + } playlist_mapping.insert (make_pair (i->view->region()->playlist(), new_time_axis_view)); dest_rtv = new_time_axis_view; } else { @@ -1477,7 +1530,20 @@ 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; + if (i->view == _primary && !_x_constrained) { + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, last_position, last_pos_qn, + modified_playlists, true); + } else { + if (i->view->region()->position_lock_style() == AudioTime) { + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, quarter_note, + modified_playlists); + } else { + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, quarter_note, + modified_playlists, true); + } + } + if (new_view != 0) { new_views.push_back (new_view); } @@ -1511,7 +1577,8 @@ void RegionMoveDrag::finished_no_copy ( bool const changed_position, bool const changed_tracks, - framecnt_t const drag_delta + MusicFrame last_position, + int32_t const ev_state ) { RegionSelection new_views; @@ -1519,10 +1586,16 @@ RegionMoveDrag::finished_no_copy ( PlaylistSet frozen_playlists; set views_to_update; RouteTimeAxisView* new_time_axis_view = 0; + framecnt_t const drag_delta = _primary->region()->position() - _last_position.frame; typedef map, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_frame (last_position.frame, last_position.division); + const double qn_delta = _primary->region()->quarter_note() - last_pos_qn; + + std::set > uniq; for (list::const_iterator i = _views.begin(); i != _views.end(); ) { RegionView* rv = i->view; @@ -1533,6 +1606,13 @@ RegionMoveDrag::finished_no_copy ( continue; } + if (uniq.find (rv->region()) != uniq.end()) { + /* prevent duplicate moves when selecting regions from shared playlists */ + ++i; + continue; + } + uniq.insert(rv->region()); + if (i->time_axis_view < 0 || i->time_axis_view >= (int)_time_axis_views.size()) { /* dragged to drop zone */ @@ -1541,6 +1621,10 @@ RegionMoveDrag::finished_no_copy ( if ((pm = playlist_mapping.find (i->view->region()->playlist())) == playlist_mapping.end()) { /* first region from this original playlist: create a new track */ new_time_axis_view = create_destination_time_axis (i->view->region(), i->initial_time_axis_view); + if(!new_time_axis_view) { // New track creation failed + Drag::abort(); + return; + } playlist_mapping.insert (make_pair (i->view->region()->playlist(), new_time_axis_view)); dest_rtv = new_time_axis_view; } else { @@ -1559,21 +1643,40 @@ RegionMoveDrag::finished_no_copy ( views_to_update.insert (dest_rtv); - framepos_t where; + MusicFrame where (0, 0); + double quarter_note; if (changed_position && !_x_constrained) { - where = rv->region()->position() - drag_delta; + where.set (rv->region()->position() - drag_delta, 0); + quarter_note = i->view->region()->quarter_note() - qn_delta; } else { - where = rv->region()->position(); + where.set (rv->region()->position(), 0); + quarter_note = i->view->region()->quarter_note(); } if (changed_tracks) { /* insert into new playlist */ + RegionView* new_view; + if (rv == _primary) { + new_view = insert_region_into_playlist ( + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, last_position, last_pos_qn, + modified_playlists, true + ); + } else { + if (rv->region()->position_lock_style() == AudioTime) { - RegionView* new_view = insert_region_into_playlist ( - RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists - ); + new_view = insert_region_into_playlist ( + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, quarter_note, + modified_playlists + ); + } else { + new_view = insert_region_into_playlist ( + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, quarter_note, + modified_playlists, true + ); + } + } if (new_view == 0) { ++i; @@ -1631,8 +1734,17 @@ RegionMoveDrag::finished_no_copy ( if (r.second) { playlist->freeze (); } - - rv->region()->set_position (where); + if (rv == _primary) { + rv->region()->set_position (where.frame, last_position.division); + } else { + if (rv->region()->position_lock_style() == AudioTime) { + /* move by frame offset */ + rv->region()->set_position (where.frame, 0); + } else { + /* move by music offset */ + rv->region()->set_position_music (rv->region()->quarter_note() - qn_delta); + } + } _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } @@ -1732,10 +1844,12 @@ RegionMoveDrag::remove_region_from_playlist ( RegionView * RegionMoveDrag::insert_region_into_playlist ( boost::shared_ptr region, - RouteTimeAxisView* dest_rtv, - layer_t dest_layer, - framecnt_t where, - PlaylistSet& modified_playlists + RouteTimeAxisView* dest_rtv, + layer_t dest_layer, + MusicFrame where, + double quarter_note, + PlaylistSet& modified_playlists, + bool for_music ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); @@ -1752,8 +1866,11 @@ RegionMoveDrag::insert_region_into_playlist ( if (r.second) { dest_playlist->clear_changes (); } - - dest_playlist->add_region (region, where); + if (for_music) { + dest_playlist->add_region (region, where.frame, 1.0, false, where.division, quarter_note, true); + } else { + dest_playlist->add_region (region, where.frame, 1.0, false, where.division); + } if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { dest_playlist->set_layer (region, dest_layer); @@ -1848,13 +1965,13 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, speed = rtv->track()->speed (); } - _last_frame_position = static_cast (_primary->region()->position() / speed); + _last_position = MusicFrame (static_cast (_primary->region()->position() / speed), 0); } void RegionMoveDrag::setup_pointer_frame_offset () { - _pointer_frame_offset = raw_grab_frame() - _last_frame_position; + _pointer_frame_offset = raw_grab_frame() - _last_position.frame; } RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, RouteTimeAxisView* v, framepos_t pos) @@ -1871,13 +1988,13 @@ RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, Rout _primary->set_position (pos, 0); _views.push_back (DraggingView (_primary, this, v)); - _last_frame_position = pos; + _last_position = MusicFrame (pos, 0); _item = _primary->get_canvas_group (); } 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()); @@ -1891,11 +2008,13 @@ RegionInsertDrag::finished (GdkEvent *, bool) _editor->begin_reversible_command (Operations::insert_region); playlist->clear_changes (); - playlist->add_region (_primary->region (), _last_frame_position); + _editor->snap_to_with_modifier (_last_position, event); + + playlist->add_region (_primary->region (), _last_position.frame, 1.0, false, _last_position.division); // Mixbus doesn't seem to ripple when inserting regions from the list: should we? yes, probably if (Config->get_edit_mode() == Ripple) { - playlist->ripple (_last_frame_position, _primary->region()->length(), _primary->region()); + playlist->ripple (_last_position.frame, _primary->region()->length(), _primary->region()); } _editor->session()->add_command (new StatefulDiffCommand (playlist)); @@ -2172,7 +2291,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) framepos_t where = adjusted_current_frame (event); assert (where >= 0); - framepos_t after; + MusicFrame after (0, 0); double delta = compute_x_delta (event, &after); framecnt_t amount = _editor->pixel_to_sample (delta); @@ -2222,7 +2341,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) prev_amount += amount; } - _last_frame_position = after; + _last_position = after; } void @@ -2234,8 +2353,7 @@ RegionRippleDrag::finished (GdkEvent* event, bool movement_occurred) if (was_double_click() && !_views.empty()) { DraggingView dv = _views.front(); - dv.view->show_region_editor (); - + _editor->edit_region (dv.view); } return; @@ -2321,13 +2439,13 @@ 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); @@ -2762,7 +2880,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*) framecnt_t const region_length = (framecnt_t) (_primary->region()->length() / speed); framepos_t const pf = adjusted_current_frame (event); - setup_snap_delta (region_start); + setup_snap_delta (MusicFrame(region_start, 0)); if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::trim_contents_modifier ())) { /* Move the contents of the region around without changing the region bounds */ @@ -2825,8 +2943,8 @@ TrimDrag::motion (GdkEvent* event, bool first_move) if (tv && tv->is_track()) { speed = tv->track()->speed(); } - framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, true); - framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event->button.state); + MusicFrame adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, true); + framecnt_t dt = adj_frame.frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event->button.state); if (first_move) { @@ -2851,7 +2969,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) { @@ -2908,11 +3025,12 @@ 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 + , adj_frame.division); + if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -2930,7 +3048,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, adj_frame.division); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -3015,18 +3133,6 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } } - if (!_views.empty()) { - if (_operation == StartTrim) { - _editor->maybe_locate_with_edit_preroll( - _views.begin()->view->region()->position()); - } - if (_operation == EndTrim) { - _editor->maybe_locate_with_edit_preroll( - _views.begin()->view->region()->position() + - _views.begin()->view->region()->length()); - } - } - if (!_editor->selection->selected (_primary)) { _primary->thaw_after_trim (); } else { @@ -3061,7 +3167,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } else { /* no mouse movement */ - if (adjusted_current_frame (event) != adjusted_frame (_drags->current_pointer_frame(), event, false)) { + if (adjusted_current_frame (event) != adjusted_frame (_drags->current_pointer_frame(), event, false).frame) { _editor->point_trim (event, adjusted_current_frame (event)); } } @@ -3079,10 +3185,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) { @@ -3180,8 +3287,13 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) --bbt.bars; } const double beat = map.beat_at_bbt (bbt); + const framepos_t frame = map.frame_at_beat (beat); _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()); + , beat, bbt, frame, _real_section->position_lock_style()); + if (!_real_section) { + aborted (true); + return; + } } /* only snap to bars. leave snap mode alone for audio locked meters.*/ @@ -3198,7 +3310,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) pf = adjusted_current_frame (event, false); } - _editor->session()->tempo_map().gui_move_meter (_real_section, pf); + _editor->session()->tempo_map().gui_set_meter_position (_real_section, pf); /* fake marker meeds to stay under the mouse, unlike the real one. */ _marker->set_position (adjusted_current_frame (event, false)); @@ -3250,13 +3362,15 @@ MeterMarkerDrag::aborted (bool moved) TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) : Drag (e, i) , _copy (c) + , _grab_bpm (0.0) , before_state (0) { DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n"); _marker = reinterpret_cast (_item->get_data ("marker")); _real_section = &_marker->tempo(); - _movable = _real_section->movable(); + _movable = !_real_section->initial(); + _grab_bpm = _real_section->note_types_per_minute(); assert (_marker); } @@ -3274,7 +3388,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 @@ -3289,7 +3403,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) // mvc drag - create a dummy marker to catch events, hide it. char name[64]; - snprintf (name, sizeof (name), "%.2f", _marker->tempo().beats_per_minute()); + snprintf (name, sizeof (name), "%.2f", _marker->tempo().note_types_per_minute()); TempoSection section (_marker->tempo()); @@ -3313,65 +3427,56 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) _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")); if (_real_section->position_lock_style() == MusicTime) { - _real_section = map.add_tempo (_marker->tempo(), map.pulse_at_frame (frame), 0, _real_section->type(), MusicTime); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + _real_section = map.add_tempo (tempo, map.exact_qn_at_frame (frame, divisions), 0, type, MusicTime); } else { - _real_section = map.add_tempo (_marker->tempo(), 0.0, frame, _real_section->type(), AudioTime); + _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime); + } + + if (!_real_section) { + aborted (true); + return; } } } - if (Keyboard::modifier_state_contains (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); + double new_bpm = max (1.5, _grab_bpm + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); 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 && !_real_section->locked_to_meter()) { - TempoMap& map (_editor->session()->tempo_map()); - const bool was_music = _real_section->position_lock_style() == MusicTime; - - const framepos_t pf = adjusted_current_frame (event); - - if (!_editor->snap_musical()) { - - if (was_music) { - _real_section->set_position_lock_style (AudioTime); - } - - map.gui_move_tempo (_real_section, pf); - - if (was_music) { - _real_section->set_position_lock_style (MusicTime); - } + 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); } else { + pf = adjusted_current_frame (event); + } - if (!was_music) { - _real_section->set_position_lock_style (MusicTime); - } + TempoMap& map (_editor->session()->tempo_map()); - map.gui_move_tempo (_real_section, pf); + /* snap to beat is 1, snap to bar is -1 (sorry) */ + const int sub_num = _editor->get_grid_music_divisions (event->button.state); - if (!was_music) { - _real_section->set_position_lock_style (AudioTime); - } - } + map.gui_set_tempo_position (_real_section, pf, sub_num); show_verbose_cursor_time (_real_section->frame()); } - - /* this has moved the bar lines themselves, so recalibrate the offset */ - setup_pointer_frame_offset(); - _marker->set_position (adjusted_current_frame (event, false)); } @@ -3406,16 +3511,14 @@ 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) - , _beat (0.0) + , _grab_qn (0.0) , _tempo (0) , before_state (0) { @@ -3427,13 +3530,12 @@ 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; - _tempo = const_cast (&map.tempo_section_at_frame (raw_grab_frame())); - sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n"; - sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).note_types_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); finished (event, false); } @@ -3442,19 +3544,24 @@ void BBTRulerDrag::setup_pointer_frame_offset () { TempoMap& map (_editor->session()->tempo_map()); - const double beat_at_frame = map.beat_at_frame (raw_grab_frame()); + 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); + 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); + 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_beat (_beat); + + _grab_qn = map.quarter_note_at_beat (beat); + + _pointer_frame_offset = raw_grab_frame() - map.frame_at_quarter_note (_grab_qn); + } void @@ -3465,18 +3572,24 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move) if (first_move) { /* get current state */ before_state = &map.get_state(); - _editor->begin_reversible_command (_("dilate tempo")); + _editor->begin_reversible_command (_("stretch tempo")); } - framepos_t const pf = adjusted_current_frame (event, false); + framepos_t pf; - if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier())) { + 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); + _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf); } ostringstream sstr; - sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).beats_per_minute() << "\n"; - sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).note_types_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3546,14 +3659,13 @@ void CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) { Drag::start_grab (event, c); - setup_snap_delta (_editor->playhead_cursor->current_frame ()); + setup_snap_delta (MusicFrame (_editor->playhead_cursor->current_frame(), 0)); _grab_zoom = _editor->samples_per_pixel; - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame where (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); _editor->snap_to_with_modifier (where, event); - _editor->_dragging_playhead = true; Session* s = _editor->session (); @@ -3588,16 +3700,18 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) } } - fake_locate (where - snap_delta (event->button.state)); + fake_locate (where.frame - snap_delta (event->button.state)); } void CursorDrag::motion (GdkEvent* event, bool) { - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame where (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (where, event); - if (where != last_pointer_frame()) { - fake_locate (where - snap_delta (event->button.state)); + + if (where.frame != last_pointer_frame()) { + fake_locate (where.frame - snap_delta (event->button.state)); } } @@ -3632,7 +3746,7 @@ CursorDrag::aborted (bool) _editor->_dragging_playhead = false; } - _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false)); + _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false).frame); } FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) @@ -3648,7 +3762,7 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr const r = arv->audio_region (); - setup_snap_delta (r->position ()); + setup_snap_delta (MusicFrame (r->position(), 0)); show_verbose_cursor_duration (r->position(), r->position() + r->fade_in()->back()->when, 32); } @@ -3666,18 +3780,19 @@ FadeInDrag::motion (GdkEvent* event, bool) { framecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.frame < (region->position() + 64)) { fade_length = 64; // this should be a minimum defined somewhere - } else if (pos > region->position() + region->length() - region->fade_out()->back()->when) { + } else if (pos.frame > region->position() + region->length() - region->fade_out()->back()->when) { fade_length = region->length() - region->fade_out()->back()->when - 1; } else { - fade_length = pos - region->position(); + fade_length = pos.frame - region->position(); } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3702,18 +3817,19 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred) } framecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.frame < (region->position() + 64)) { fade_length = 64; // this should be a minimum defined somewhere - } else if (pos >= region->position() + region->length() - region->fade_out()->back()->when) { + } else if (pos.frame >= region->position() + region->length() - region->fade_out()->back()->when) { fade_length = region->length() - region->fade_out()->back()->when - 1; } else { - fade_length = pos - region->position(); + fade_length = pos.frame - region->position(); } bool in_command = false; @@ -3772,7 +3888,7 @@ FadeOutDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr r = arv->audio_region (); - setup_snap_delta (r->last_frame ()); + setup_snap_delta (MusicFrame (r->last_frame(), 0)); show_verbose_cursor_duration (r->last_frame() - r->fade_out()->back()->when, r->last_frame()); } @@ -3789,19 +3905,19 @@ void FadeOutDrag::motion (GdkEvent* event, bool) { framecnt_t fade_length; + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.frame > (region->last_frame() - 64)) { fade_length = 64; // this should really be a minimum fade defined somewhere - } else if (pos <= region->position() + region->fade_in()->back()->when) { + } else if (pos.frame <= region->position() + region->fade_in()->back()->when) { fade_length = region->length() - region->fade_in()->back()->when - 1; } else { - fade_length = region->last_frame() - pos; + fade_length = region->last_frame() - pos.frame; } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3826,19 +3942,19 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred) } framecnt_t fade_length; + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.frame > (region->last_frame() - 64)) { fade_length = 64; // this should really be a minimum fade defined somewhere - } else if (pos <= region->position() + region->fade_in()->back()->when) { + } else if (pos.frame <= region->position() + region->fade_in()->back()->when) { fade_length = region->length() - region->fade_in()->back()->when - 1; } else { - fade_length = region->last_frame() - pos; + fade_length = region->last_frame() - pos.frame; } bool in_command = false; @@ -3933,7 +4049,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } else { show_verbose_cursor_time (location->end()); } - setup_snap_delta (is_start ? location->start() : location->end()); + setup_snap_delta (MusicFrame (is_start ? location->start() : location->end(), 0)); Selection::Operation op = ArdourKeyboard::selection_type (event->button.state); @@ -4037,7 +4153,7 @@ MarkerDrag::motion (GdkEvent* event, bool) Location *copy_location = 0; framecnt_t const sd = snap_delta (event->button.state); - framecnt_t const newframe = adjusted_frame (_drags->current_pointer_frame () + sd, event, true) - sd; + framecnt_t const newframe = adjusted_frame (_drags->current_pointer_frame () + sd, event, true).frame - sd; framepos_t next = newframe; if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::push_points_modifier ())) { @@ -4097,6 +4213,8 @@ MarkerDrag::motion (GdkEvent* event, bool) return; } + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + /* now move them all */ for (x = _copied_locations.begin(); x != _copied_locations.end(); ++x) { @@ -4114,8 +4232,7 @@ MarkerDrag::motion (GdkEvent* event, bool) if (copy_location->is_mark()) { /* now move it */ - - copy_location->set_start (copy_location->start() + f_delta); + copy_location->set_start (copy_location->start() + f_delta, false, true, divisions); } else { @@ -4125,27 +4242,27 @@ MarkerDrag::motion (GdkEvent* event, bool) if (is_start) { // start-of-range marker if (move_both || (*x).move_both) { - copy_location->set_start (new_start); - copy_location->set_end (new_end); + copy_location->set_start (new_start, false, true, divisions); + copy_location->set_end (new_end, false, true, divisions); } else if (new_start < copy_location->end()) { - copy_location->set_start (new_start); + copy_location->set_start (new_start, false, true, divisions); } else if (newframe > 0) { //_editor->snap_to (next, RoundUpAlways, true); - copy_location->set_end (next); - copy_location->set_start (newframe); + copy_location->set_end (next, false, true, divisions); + copy_location->set_start (newframe, false, true, divisions); } } else { // end marker if (move_both || (*x).move_both) { - copy_location->set_end (new_end); - copy_location->set_start (new_start); + copy_location->set_end (new_end, divisions); + copy_location->set_start (new_start, false, true, divisions); } else if (new_end > copy_location->start()) { - copy_location->set_end (new_end); + copy_location->set_end (new_end, false, true, divisions); } else if (newframe > 0) { //_editor->snap_to (next, RoundDownAlways, true); - copy_location->set_start (next); - copy_location->set_end (newframe); + copy_location->set_start (next, false, true, divisions); + copy_location->set_end (newframe, false, true, divisions); } } } @@ -4222,6 +4339,7 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred) MarkerSelection::iterator i; CopiedLocationInfo::iterator x; + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); bool is_start; for (i = _editor->selection->markers.begin(), x = _copied_locations.begin(); @@ -4240,9 +4358,13 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred) in_command = true; } if (location->is_mark()) { - location->set_start (((*x).location)->start()); + location->set_start (((*x).location)->start(), false, true, divisions); } else { - location->set (((*x).location)->start(), ((*x).location)->end()); + location->set (((*x).location)->start(), ((*x).location)->end(), true, divisions); + } + + if (location->is_session_range()) { + _editor->session()->set_end_is_free (false); } } } @@ -4311,11 +4433,10 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) // start the grab at the center of the control point so // the point doesn't 'jump' to the mouse after the first drag - _fixed_grab_x = _point->get_x(); + _fixed_grab_x = _point->get_x() + _editor->sample_to_pixel_unrounded (_point->line().offset()); _fixed_grab_y = _point->get_y(); - framepos_t pos = _editor->pixel_to_sample (_fixed_grab_x); - setup_snap_delta (pos); + setup_snap_delta (MusicFrame (_editor->pixel_to_sample (_fixed_grab_x), 0)); float const fraction = 1 - (_point->get_y() / _point->line().height()); show_verbose_cursor_text (_point->line().get_verbose_cursor_string (fraction)); @@ -4368,14 +4489,14 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) cy = zero_gain_y; } - framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta (event->button.state); + MusicFrame cx_mf (_editor->pixel_to_sample (cx) + snap_delta (event->button.state), 0); if (!_x_constrained && need_snap) { - _editor->snap_to_with_modifier (cx_frames, event); + _editor->snap_to_with_modifier (cx_mf, event); } - cx_frames -= snap_delta (event->button.state); - cx_frames = min (cx_frames, _point->line().maximum_time()); + cx_mf.frame -= snap_delta (event->button.state); + cx_mf.frame = min (cx_mf.frame, _point->line().maximum_time() + _point->line().offset()); float const fraction = 1.0 - (cy / _point->line().height()); @@ -4385,7 +4506,7 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) _point->line().start_drag_single (_point, _fixed_grab_x, initial_fraction); } pair result; - result = _point->line().drag_motion (_editor->sample_to_pixel_unrounded (cx_frames), fraction, false, _pushing, _final_index); + result = _point->line().drag_motion (_editor->sample_to_pixel_unrounded (cx_mf.frame), fraction, false, _pushing, _final_index); show_verbose_cursor_text (_point->line().get_verbose_cursor_string (result.second)); } @@ -4648,24 +4769,23 @@ RubberbandSelectDrag::motion (GdkEvent* event, bool) framepos_t end; double y1; double y2; - framepos_t const pf = adjusted_current_frame (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid()); + MusicFrame grab (grab_frame (), 0); - framepos_t grab = grab_frame (); if (UIConfiguration::instance().get_rubberbanding_snaps_to_grid ()) { _editor->snap_to_with_modifier (grab, event); } else { - grab = raw_grab_frame (); + grab.frame = raw_grab_frame (); } /* base start and end on initial click position */ - if (pf < grab) { + if (pf < grab.frame) { start = pf; - end = grab; + end = grab.frame; } else { end = pf; - start = grab; + start = grab.frame; } if (current_pointer_y() < grab_y()) { @@ -4814,10 +4934,10 @@ TimeFXDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _editor->get_selection().add (_primary); - framepos_t where = _primary->region()->position(); + MusicFrame where (_primary->region()->position(), 0); setup_snap_delta (where); - show_verbose_cursor_duration (where, adjusted_current_frame (event), 0); + show_verbose_cursor_duration (where.frame, adjusted_current_frame (event), 0); } void @@ -4825,19 +4945,19 @@ TimeFXDrag::motion (GdkEvent* event, bool) { RegionView* rv = _primary; StreamView* cv = rv->get_time_axis_view().view (); - pair const tv = _editor->trackview_by_y_position (grab_y()); int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers(); - framepos_t pf = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pf (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (pf, event); - pf -= snap_delta (event->button.state); + pf.frame -= snap_delta (event->button.state); - if (pf > rv->region()->position()) { - rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf, layers, layer); + if (pf.frame > rv->region()->position()) { + rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf.frame, layers, layer); } - show_verbose_cursor_duration (_primary->region()->position(), pf, 0); + show_verbose_cursor_duration (_primary->region()->position(), pf.frame, 0); } void @@ -4931,6 +5051,7 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o) : Drag (e, i) , _operation (o) , _add (false) + , _track_selection_at_start (e) , _time_selection_at_start (!_editor->get_selection().time.empty()) { DEBUG_TRACE (DEBUG::Drags, "New SelectionDrag\n"); @@ -5020,33 +5141,36 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) framepos_t end = 0; framecnt_t length = 0; framecnt_t distance = 0; - + MusicFrame start_mf (0, 0); framepos_t const pending_position = adjusted_current_frame (event); if (_operation != CreateSelection && pending_position == last_pointer_frame()) { return; } + if (first_move) { + _track_selection_at_start = _editor->selection->tracks; + } + switch (_operation) { case CreateSelection: { - framepos_t grab = grab_frame (); - + MusicFrame grab (grab_frame (), 0); if (first_move) { - grab = adjusted_current_frame (event, false); - if (grab < pending_position) { + grab.frame = adjusted_current_frame (event, false); + if (grab.frame < pending_position) { _editor->snap_to (grab, RoundDownMaybe); } else { _editor->snap_to (grab, RoundUpMaybe); } } - if (pending_position < grab) { + if (pending_position < grab.frame) { start = pending_position; - end = grab; + end = grab.frame; } else { end = pending_position; - start = grab; + start = grab.frame; } /* first drag: Either add to the selection @@ -5098,32 +5222,30 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) } } - //now find any tracks that are GROUPED with the tracks we selected - 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) ) { - 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()) ) - grouped_add.push_back (*j); + //now compare our list with the current selection, and add as necessary + //( NOTE: most mouse moves don't change the selection so we can't just SET it for every mouse move; it gets clunky ) + TrackViewList tracks_to_add; + TrackViewList tracks_to_remove; + + if (!first_move) { + for (TrackViewList::const_iterator i = _editor->selection->tracks.begin(); i != _editor->selection->tracks.end(); ++i) { + if (!new_selection.contains (*i) && !_track_selection_at_start.contains (*i)) { + tracks_to_remove.push_back (*i); } } } - //now compare our list with the current selection, and add or remove as necessary - //( NOTE: most mouse moves don't change the selection so we can't just SET it for every mouse move; it gets clunky ) - TrackViewList tracks_to_add; - TrackViewList tracks_to_remove; - for (TrackViewList::const_iterator i = grouped_add.begin(); i != grouped_add.end(); ++i) - if ( !_editor->selection->tracks.contains ( *i ) ) - tracks_to_add.push_back ( *i ); - for (TrackViewList::const_iterator i = _editor->selection->tracks.begin(); i != _editor->selection->tracks.end(); ++i) - if ( !grouped_add.contains ( *i ) ) - tracks_to_remove.push_back ( *i ); - _editor->selection->add(tracks_to_add); - _editor->selection->remove(tracks_to_remove); + for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) { + if (!_editor->selection->tracks.contains (*i)) { + tracks_to_add.push_back (*i); + } + } + _editor->selection->add (tracks_to_add); + + if (!tracks_to_remove.empty()) { + _editor->selection->remove (tracks_to_remove); + } } } break; @@ -5159,9 +5281,11 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) length = end - start; distance = pending_position - start; start = pending_position; - _editor->snap_to (start); - end = start + length; + start_mf.frame = start; + _editor->snap_to (start_mf); + + end = start_mf.frame + length; break; @@ -5207,10 +5331,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) s->request_play_range (&_editor->selection->time, true); } else if (!s->config.get_external_sync()) { if (UIConfiguration::instance().get_follow_edits() && !s->transport_rolling()) { - if (_operation == SelectionEndTrim) - _editor->maybe_locate_with_edit_preroll( _editor->get_selection().time.end_frame()); - else - s->request_locate (_editor->get_selection().time.start()); + s->request_locate (_editor->get_selection().time.start()); } } @@ -5225,6 +5346,13 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) /* just a click, no pointer movement. */ + if (was_double_click()) { + if (UIConfiguration::instance().get_use_double_click_to_zoom_to_selection()) { + _editor->temporal_zoom_selection (Both); + return; + } + } + if (_operation == SelectionExtend) { if (_time_selection_at_start) { framepos_t pos = adjusted_current_frame (event, false); @@ -5352,15 +5480,15 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) framepos_t const pf = adjusted_current_frame (event); if (_operation == CreateSkipMarker || _operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker) { - framepos_t grab = grab_frame (); + MusicFrame grab (grab_frame (), 0); _editor->snap_to (grab); if (pf < grab_frame()) { start = pf; - end = grab; + end = grab.frame; } else { end = pf; - start = grab; + start = grab.frame; } /* first drag: Either add to the selection @@ -5430,7 +5558,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) } newloc = new Location ( *_editor->session(), _editor->temp_location->start(), _editor->temp_location->end(), rangename, (Location::Flags) flags - ); + , _editor->get_grid_music_divisions (event->button.state)); _editor->session()->locations()->add (newloc, true); XMLNode &after = _editor->session()->locations()->get_state(); @@ -5517,7 +5645,9 @@ NoteDrag::NoteDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i) , _cumulative_dx (0) , _cumulative_dy (0) + , _earliest (0.0) , _was_selected (false) + , _copy (false) { DEBUG_TRACE (DEBUG::Drags, "New NoteDrag\n"); @@ -5527,11 +5657,25 @@ NoteDrag::NoteDrag (Editor* e, ArdourCanvas::Item* i) _note_height = _region->midi_stream_view()->note_height (); } +void +NoteDrag::setup_pointer_frame_offset () +{ + _pointer_frame_offset = raw_grab_frame() + - _editor->session()->tempo_map().frame_at_quarter_note (_region->session_relative_qn (_primary->note()->time().to_double())); +} + void NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *) { Drag::start_grab (event); - setup_snap_delta (_region->source_beats_to_absolute_frames (_primary->note()->time ())); + + if (ArdourKeyboard::indicates_copy (event->button.state)) { + _copy = true; + } else { + _copy = false; + } + + setup_snap_delta (MusicFrame (_region->source_beats_to_absolute_frames (_primary->note()->time ()), 0)); if (!(_was_selected = _primary->selected())) { @@ -5555,49 +5699,38 @@ NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *) } } -/** @return Current total drag x change in frames */ -frameoffset_t -NoteDrag::total_dx (const guint state) const +/** @return Current total drag x change in quarter notes */ +double +NoteDrag::total_dx (GdkEvent * event) 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 ()); + frameoffset_t const n = map.frame_at_quarter_note (_region->session_relative_qn (_primary->note()->time().to_double())); - /* new time of the primary note in session frames */ - frameoffset_t st = n + dx + snap_delta (state); + /* primary note time in quarter notes */ + double const n_qn = _region->session_relative_qn (_primary->note()->time().to_double()); - framepos_t const rp = _region->region()->position (); - - /* prevent the note being dragged earlier than the region's position */ - st = max (st, rp); - - /* possibly snap and return corresponding delta */ + /* new time of the primary note in session frames */ + frameoffset_t st = n + dx + snap_delta (event->button.state); - bool snap = true; + /* possibly snap and return corresponding delta in quarter notes */ + MusicFrame snap (st, 0); + _editor->snap_to_with_modifier (snap, event); + double ret = map.exact_qn_at_frame (snap.frame, snap.division) - n_qn - snap_delta_music (event->button.state); - if (ArdourKeyboard::indicates_snap (state)) { - if (_editor->snap_mode () != SnapOff) { - snap = false; - } - } else { - if (_editor->snap_mode () == SnapOff) { - snap = false; - /* inverted logic here - we;re in snapoff but we've pressed the snap delta modifier */ - if (ArdourKeyboard::indicates_snap_delta (state)) { - snap = true; - } - } + /* prevent the earliest note being dragged earlier than the region's start position */ + if (_earliest + ret < _region->midi_region()->start_beats()) { + ret -= (_earliest + ret) - _region->midi_region()->start_beats(); } - frameoffset_t ret; - if (snap) { - bool const ensure_snap = _editor->snap_mode () != SnapMagnetic; - ret = _region->snap_frame_to_frame (st - rp, ensure_snap) + rp - n - snap_delta (state); - } else { - ret = st - n - snap_delta (state); - } return ret; } @@ -5605,45 +5738,63 @@ NoteDrag::total_dx (const guint state) const int8_t NoteDrag::total_dy () const { - MidiStreamView* msv = _region->midi_stream_view (); + if (_y_constrained) { + return 0; + } + double const y = _region->midi_view()->y_position (); /* new current note */ - uint8_t n = msv->y_to_note (current_pointer_y () - y); + uint8_t n = _region->y_to_note (current_pointer_y () - y); /* clamp */ + MidiStreamView* msv = _region->midi_stream_view (); n = max (msv->lowest_note(), n); n = min (msv->highest_note(), n); /* and work out delta */ - return n - msv->y_to_note (grab_y() - y); + return n - _region->y_to_note (grab_y() - y); } void -NoteDrag::motion (GdkEvent * event, bool) +NoteDrag::motion (GdkEvent * event, bool first_move) { + if (first_move) { + _earliest = _region->earliest_in_selection().to_double(); + if (_copy) { + /* make copies of all the selected notes */ + _primary = _region->copy_selection (_primary); + } + } + /* Total change in x and y since the start of the drag */ - frameoffset_t const dx = total_dx (event->button.state); + double const dx_qn = total_dx (event); 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 : dx_qn - _cumulative_dx; + double const tdy = _y_constrained ? 0 : -dy * _note_height - _cumulative_dy; if (tdx || tdy) { - _cumulative_dx += tdx; + _cumulative_dx = dx_qn; _cumulative_dy += tdy; int8_t note_delta = total_dy(); - _region->move_selection (tdx, tdy, note_delta); + if (tdx || tdy) { + if (_copy) { + _region->move_copies (dx_qn, tdy, note_delta); + } else { + _region->move_selection (dx_qn, 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); + } } } @@ -5692,7 +5843,7 @@ NoteDrag::finished (GdkEvent* ev, bool moved) } } } else { - _region->note_dropped (_primary, total_dx (ev->button.state), total_dy()); + _region->note_dropped (_primary, total_dx (ev), total_dy(), _copy); } } @@ -6010,6 +6161,9 @@ void PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred) { if (!movement_occurred) { + if (was_double_click()) { + _region_view->edit_patch_change (_patch_change); + } return; } @@ -6139,13 +6293,12 @@ NoteCreateDrag::~NoteCreateDrag () framecnt_t NoteCreateDrag::grid_frames (framepos_t t) const { - bool success; - Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, t); - if (!success) { - grid_beats = Evoral::Beats(1); - } - return _region_view->region_beats_to_region_frames (grid_beats); + const Evoral::Beats grid_beats = _region_view->get_grid_beats (t); + const Evoral::Beats t_beats = _region_view->region_frames_to_region_beats (t); + + return _region_view->region_beats_to_region_frames (t_beats + grid_beats) + - _region_view->region_beats_to_region_frames (t_beats); } void @@ -6154,25 +6307,38 @@ 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; + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); + + double eqaf = map.exact_qn_at_frame (pf, divisions); + + if (divisions != 0) { + + 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(); + } } - _note[0] = adjusted_frame (pf, event) - _region_view->region()->position (); - _note[1] = _note[0]; + _note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); + /* minimum initial length is grid beats */ + _note[1] = map.frame_at_quarter_note (eqaf + grid_beats.to_double()) - _region_view->region()->position(); - MidiStreamView* sv = _region_view->midi_stream_view (); - double const x = _editor->sample_to_pixel (_note[0]); - double const y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y))); + double const x0 = _editor->sample_to_pixel (_note[0]); + double const x1 = _editor->sample_to_pixel (_note[1]); + double const y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); - _drag_rect->set (ArdourCanvas::Rect (x, y, x, y + floor (_region_view->midi_stream_view()->note_height ()))); + _drag_rect->set (ArdourCanvas::Rect (x0, y, x1, y + floor (_region_view->midi_stream_view()->note_height ()))); _drag_rect->set_outline_all (); _drag_rect->set_outline_color (0xffffff99); _drag_rect->set_fill_color (0xffffff66); @@ -6181,7 +6347,29 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) void NoteCreateDrag::motion (GdkEvent* event, bool) { - _note[1] = max ((framepos_t)0, adjusted_current_frame (event) - _region_view->region()->position ()); + TempoMap& map (_editor->session()->tempo_map()); + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + double eqaf = map.exact_qn_at_frame (pf, divisions); + + if (divisions != 0) { + + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); + + 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(); + } + + eqaf += grid_beats.to_double(); + } + _note[1] = max ((framepos_t)0, map.frame_at_quarter_note (eqaf) - _region_view->region()->position ()); + double const x0 = _editor->sample_to_pixel (_note[0]); double const x1 = _editor->sample_to_pixel (_note[1]); _drag_rect->set_x0 (std::min(x0, x1)); @@ -6189,26 +6377,23 @@ NoteCreateDrag::motion (GdkEvent* event, bool) } void -NoteCreateDrag::finished (GdkEvent*, bool had_movement) +NoteCreateDrag::finished (GdkEvent* ev, bool had_movement) { - if (!had_movement) { - return; - } - + /* we create a note even if there was no movement */ framepos_t const start = min (_note[0], _note[1]); - framecnt_t length = (framecnt_t) fabs ((double)(_note[0] - _note[1])); - + framepos_t const start_sess_rel = start + _region_view->region()->position(); + framecnt_t length = max (_editor->pixel_to_sample (1.0), (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_notes_between_frames (start_sess_rel, start_sess_rel + length); + Evoral::Beats qn_length_beats = max (Evoral::Beats::ticks(1), Evoral::Beats (qn_length)); - _region_view->create_note_at (start, _drag_rect->y0(), length_beats, false); + _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false); } double @@ -6225,6 +6410,100 @@ NoteCreateDrag::aborted (bool) } +HitCreateDrag::HitCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv) + : Drag (e, i) + , _region_view (rv) + , _last_pos (0) + , _last_y (0.0) +{ +} + +HitCreateDrag::~HitCreateDrag () +{ +} + +void +HitCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + + TempoMap& map (_editor->session()->tempo_map()); + + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + const double eqaf = map.exact_qn_at_frame (pf, divisions); + + boost::shared_ptr mr = _region_view->midi_region(); + + if (eqaf >= mr->quarter_note() + mr->length_beats()) { + return; + } + + const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); + const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); + + Evoral::Beats length = _region_view->get_grid_beats (pf); + + _region_view->create_note_at (start, y, length, event->button.state, false); + + _last_pos = start; + _last_y = y; +} + +void +HitCreateDrag::motion (GdkEvent* event, bool) +{ + TempoMap& map (_editor->session()->tempo_map()); + + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + if (divisions == 0) { + return; + } + + const double eqaf = map.exact_qn_at_frame (pf, divisions); + const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position (); + const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); + + if (_last_pos == start && y == _last_y) { + return; + } + + Evoral::Beats length = _region_view->get_grid_beats (pf); + + boost::shared_ptr mr = _region_view->midi_region(); + if (eqaf >= mr->quarter_note() + mr->length_beats()) { + return; + } + + _region_view->create_note_at (start, y, length, event->button.state, false); + + _last_pos = start; + _last_y = y; +} + +void +HitCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */) +{ + +} + +double +HitCreateDrag::y_to_region (double y) const +{ + double x = 0; + _region_view->get_canvas_group()->canvas_to_item (x, y); + return y; +} + +void +HitCreateDrag::aborted (bool) +{ + // umm.. +} + CrossfadeEdgeDrag::CrossfadeEdgeDrag (Editor* e, AudioRegionView* rv, ArdourCanvas::Item* i, bool start_yn) : Drag (e, i) , arv (rv) @@ -6327,6 +6606,7 @@ RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, framepos_t po { line->set_position (pos); line->show (); + line->track_canvas_item().reparent (_editor->_drag_motion_group); } RegionCutDrag::~RegionCutDrag () @@ -6335,33 +6615,94 @@ RegionCutDrag::~RegionCutDrag () } void -RegionCutDrag::motion (GdkEvent*, bool) +RegionCutDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) { - framepos_t where = _drags->current_pointer_frame(); - _editor->snap_to (where); + Drag::start_grab (event, c); + motion (event, false); +} - line->set_position (where); +void +RegionCutDrag::motion (GdkEvent* event, bool) +{ + MusicFrame pos (_drags->current_pointer_frame(), 0); + _editor->snap_to_with_modifier (pos, event); + + line->set_position (pos.frame); } void -RegionCutDrag::finished (GdkEvent*, bool) +RegionCutDrag::finished (GdkEvent* event, bool) { _editor->get_track_canvas()->canvas()->re_enter(); - framepos_t pos = _drags->current_pointer_frame(); + MusicFrame pos (_drags->current_pointer_frame(), 0); + _editor->snap_to_with_modifier (pos, event); line->hide (); - RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos); + RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos.frame); if (rs.empty()) { return; } - _editor->split_regions_at (pos, rs); + _editor->split_regions_at (pos, rs, false); } void RegionCutDrag::aborted (bool) { } + +RulerZoomDrag::RulerZoomDrag (Editor* e, ArdourCanvas::Item* item) + : Drag (e, item, true) +{ +} + +void +RulerZoomDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +{ + Drag::start_grab (event, c); + + framepos_t where = _editor->canvas_event_sample(event); + + _editor->_dragging_playhead = true; + + _editor->playhead_cursor->set_position (where); +} + +void +RulerZoomDrag::motion (GdkEvent* event, bool) +{ + framepos_t where = _editor->canvas_event_sample(event); + + _editor->playhead_cursor->set_position (where); + + const double movement_limit = 20.0; + const double scale = 1.08; + const double y_delta = last_pointer_y() - current_pointer_y(); + + if (y_delta > 0 && y_delta < movement_limit) { + _editor->temporal_zoom_step_mouse_focus_scale (true, scale); + } else if (y_delta < 0 && y_delta > -movement_limit) { + _editor->temporal_zoom_step_mouse_focus_scale (false, scale); + } +} + +void +RulerZoomDrag::finished (GdkEvent*, bool) +{ + _editor->_dragging_playhead = false; + + Session* s = _editor->session (); + if (s) { + s->request_locate (_editor->playhead_cursor->current_frame (), _was_rolling); + _editor->_pending_locate_request = true; + } + +} + +void +RulerZoomDrag::aborted (bool) +{ +}