X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=654cca2a162d7cfb9409265c4eed782ca4d4e789;hb=0883f02de92478800ad232f10d388219e2817ed7;hp=20d28f9c05773a1dc01afccfab7bf28b6debe312;hpb=33e95a15778e7fe87c204b0c4f2db039f857b523;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 20d28f9c05..654cca2a16 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -37,8 +37,10 @@ #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" +#include "ardour/session_playlists.h" #include "canvas/canvas.h" #include "canvas/scroll_group.h" @@ -84,7 +86,7 @@ DragManager::DragManager (Editor* e) , _ending (false) , _current_pointer_x (0.0) , _current_pointer_y (0.0) - , _current_pointer_frame (0) + , _current_pointer_sample (0) , _old_follow_playhead (false) { } @@ -137,7 +139,7 @@ DragManager::start_grab (GdkEvent* e, Gdk::Cursor* c) _old_follow_playhead = _editor->follow_playhead (); _editor->set_follow_playhead (false); - _current_pointer_frame = _editor->canvas_event_sample (e, &_current_pointer_x, &_current_pointer_y); + _current_pointer_sample = _editor->canvas_event_sample (e, &_current_pointer_x, &_current_pointer_y); for (list::const_iterator i = _drags.begin(); i != _drags.end(); ++i) { (*i)->start_grab (e, c); @@ -189,7 +191,7 @@ DragManager::motion_handler (GdkEvent* e, bool from_autoscroll) * Can we guarantee that this is true? */ - _current_pointer_frame = _editor->canvas_event_sample (e, &_current_pointer_x, &_current_pointer_y); + _current_pointer_sample = _editor->canvas_event_sample (e, &_current_pointer_x, &_current_pointer_y); for (list::iterator i = _drags.begin(); i != _drags.end(); ++i) { bool const t = (*i)->motion_handler (e, from_autoscroll); @@ -220,7 +222,7 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, bool trackview_only) : _editor (e) , _drags (0) , _item (i) - , _pointer_frame_offset (0) + , _pointer_sample_offset (0) , _x_constrained (false) , _y_constrained (false) , _was_rolling (false) @@ -233,10 +235,11 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, bool trackview_only) , _grab_y (0.0) , _last_pointer_x (0.0) , _last_pointer_y (0.0) - , _raw_grab_frame (0) - , _grab_frame (0) - , _last_pointer_frame (0) + , _raw_grab_sample (0) + , _grab_sample (0) + , _last_pointer_sample (0) , _snap_delta (0) + , _snap_delta_music (0.0) , _constraint_pressed (false) { @@ -264,11 +267,11 @@ 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); + _raw_grab_sample = _editor->canvas_event_sample (event, &_grab_x, &_grab_y); - setup_pointer_frame_offset (); - _grab_frame = adjusted_frame (_raw_grab_frame, event); - _last_pointer_frame = _grab_frame; + setup_pointer_sample_offset (); + _grab_sample = adjusted_sample (_raw_grab_sample, event).sample; + _last_pointer_sample = _grab_sample; _last_pointer_x = _grab_x; if (_trackview_only) { @@ -290,16 +293,9 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor) _was_rolling = false; } - switch (_editor->snap_type()) { - case SnapToRegionStart: - case SnapToRegionEnd: - case SnapToRegionSync: - case SnapToRegionBoundary: - _editor->build_region_boundary_cache (); - break; - default: - break; - } +// if ( UIConfiguration::instance().get_snap_to_region_start() || UIConfiguration::instance().get_snap_to_region_end() || UIConfiguration::instance().get_snap_to_region_sync() ) { +// _editor->build_region_boundary_cache (); +// } } /** Call to end a drag `successfully'. Ungrabs item and calls @@ -323,13 +319,13 @@ Drag::end_grab (GdkEvent* event) return _move_threshold_passed; } -framepos_t -Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const +MusicSample +Drag::adjusted_sample (samplepos_t f, GdkEvent const * event, bool snap) const { - framepos_t pos = 0; + MusicSample pos (0, 0); - if (f > _pointer_frame_offset) { - pos = f - _pointer_frame_offset; + if (f > _pointer_sample_offset) { + pos.sample = f - _pointer_sample_offset; } if (snap) { @@ -339,13 +335,13 @@ Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const return pos; } -framepos_t -Drag::adjusted_current_frame (GdkEvent const * event, bool snap) const +samplepos_t +Drag::adjusted_current_sample (GdkEvent const * event, bool snap) const { - return adjusted_frame (_drags->current_pointer_frame (), event, snap); + return adjusted_sample (_drags->current_pointer_sample (), event, snap).sample; } -frameoffset_t +sampleoffset_t Drag::snap_delta (guint state) const { if (ArdourKeyboard::indicates_snap_delta (state)) { @@ -354,6 +350,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 @@ -372,11 +377,18 @@ Drag::current_pointer_y () const } void -Drag::setup_snap_delta (framepos_t pos) +Drag::setup_snap_delta (MusicSample pos) { - framepos_t temp = pos; - _editor->snap_to (temp, ARDOUR::RoundNearest, false, true); - _snap_delta = temp - pos; + TempoMap& map (_editor->session()->tempo_map()); + MusicSample snap (pos); + _editor->snap_to (snap, ARDOUR::RoundNearest, ARDOUR::SnapToAny_Visual, true); + _snap_delta = snap.sample - pos.sample; + + _snap_delta_music = 0.0; + + if (_snap_delta != 0) { + _snap_delta_music = map.exact_qn_at_sample (snap.sample, snap.division) - map.exact_qn_at_sample (pos.sample, pos.division); + } } bool @@ -389,13 +401,13 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) return false; } - pair const threshold = move_threshold (); + pair const threshold = move_threshold (); bool const old_move_threshold_passed = _move_threshold_passed; if (!_move_threshold_passed) { - bool const xp = (::llabs (_drags->current_pointer_frame () - _raw_grab_frame) >= threshold.first); + bool const xp = (::llabs (_drags->current_pointer_sample () - _raw_grab_sample) >= threshold.first); bool const yp = (::fabs ((current_pointer_y () - _grab_y)) >= threshold.second); _move_threshold_passed = ((xp && x_movement_matters()) || (yp && y_movement_matters())); @@ -466,7 +478,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) _last_pointer_x = _drags->current_pointer_x (); _last_pointer_y = current_pointer_y (); - _last_pointer_frame = adjusted_current_frame (event, false); + _last_pointer_sample = adjusted_current_sample (event, false); } return true; @@ -491,14 +503,14 @@ Drag::abort () } void -Drag::show_verbose_cursor_time (framepos_t frame) +Drag::show_verbose_cursor_time (samplepos_t sample) { - _editor->verbose_cursor()->set_time (frame); + _editor->verbose_cursor()->set_time (sample); _editor->verbose_cursor()->show (); } void -Drag::show_verbose_cursor_duration (framepos_t start, framepos_t end, double /*xoffset*/) +Drag::show_verbose_cursor_duration (samplepos_t start, samplepos_t end, double /*xoffset*/) { _editor->verbose_cursor()->set_duration (start, end); _editor->verbose_cursor()->show (); @@ -512,24 +524,26 @@ Drag::show_verbose_cursor_text (string const & text) } boost::shared_ptr -Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_num) +Drag::add_midi_region (MidiTimeAxisView* view, bool commit) { if (_editor->session()) { const TempoMap& map (_editor->session()->tempo_map()); - framecnt_t pos = grab_frame(); + samplecnt_t pos = grab_sample(); /* 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 (max (0.0, map.beat_at_frame (pos)) + 1.0) - pos; - return view->add_region (grab_frame(), len, commit, sub_num); + samplecnt_t len = map.sample_at_beat (max (0.0, map.beat_at_sample (pos)) + 1.0) - pos; + return view->add_region (grab_sample(), len, commit); } return boost::shared_ptr(); } -struct PresentationInfoTimeAxisViewSorter { - bool operator() (TimeAxisView* a, TimeAxisView* b) { - return a->stripable()->presentation_info().order() < b->stripable()->presentation_info().order(); +struct TimeAxisViewStripableSorter { + bool operator() (TimeAxisView* tav_a, TimeAxisView* tav_b) { + boost::shared_ptr const& a = tav_a->stripable (); + boost::shared_ptr const& b = tav_b->stripable (); + return ARDOUR::Stripable::Sorter () (a, b); } }; @@ -545,7 +559,7 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, listtrack_views; - track_views.sort (PresentationInfoTimeAxisViewSorter ()); + track_views.sort (TimeAxisViewStripableSorter ()); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { _time_axis_views.push_back (*i); @@ -602,6 +616,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) @@ -616,9 +631,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.sample); pair const tv = _editor->trackview_by_y_position (current_pointer_y ()); if (tv.first) { @@ -638,64 +653,67 @@ 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, MusicSample* pending_region_position) { - /* compute the amount of pointer motion in frames, and where + /* compute the amount of pointer motion in samples, and where the region would be if we moved it by that much. */ - *pending_region_position = adjusted_frame (_drags->current_pointer_frame (), event, false); + if (_x_constrained) { + *pending_region_position = _last_position; + return 0.0; + } + + *pending_region_position = adjusted_sample (_drags->current_pointer_sample (), event, false); - framepos_t sync_frame; - framecnt_t sync_offset; + samplecnt_t sync_offset; int32_t sync_dir; sync_offset = _primary->region()->sync_offset (sync_dir); /* we don't handle a sync point that lies before zero. */ - if (sync_dir >= 0 || (sync_dir < 0 && *pending_region_position >= 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; + if (sync_dir >= 0 || (sync_dir < 0 && pending_region_position->sample >= sync_offset)) { + samplecnt_t const sd = snap_delta (event->button.state); + MusicSample sync_snap (pending_region_position->sample + (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.sample) - 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->sample > max_samplepos - _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->sample != _last_position.sample) && 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->sample - _last_position.sample); /* total x movement */ - framecnt_t total_dx = *pending_region_position; - if (regions_came_from_canvas()) { - total_dx = total_dx - grab_frame (); - } + samplecnt_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; + sampleoffset_t const off = i->view->region()->position() + total_dx; + if (off < 0) { + dx = dx - _editor->sample_to_pixel_unrounded (off); + *pending_region_position = MusicSample (pending_region_position->sample - off, 0); break; } } - } + _editor->set_snapped_cursor_position(pending_region_position->sample); + return dx; } @@ -930,9 +948,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(); + MusicSample 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_sample (_last_position.sample, _last_position.division); + double const qn_delta = tmap.exact_qn_at_sample (pending_region_position.sample, pending_region_position.division) - last_pos_qn; + + _last_position = pending_region_position; /* calculate hidden tracks in current y-axis delta */ int delta_skip = 0; @@ -1099,6 +1122,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 */ @@ -1131,7 +1158,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.sample); } else { Duple track_origin; @@ -1160,17 +1187,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_sample (rv->get_position()); + samplepos_t const x_pos_music = tmap.sample_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.sample); } /* keep track of pointer movement */ @@ -1258,8 +1301,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 - , _editor->get_grid_music_divisions (event->button.state)); + 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. @@ -1340,8 +1385,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; @@ -1357,16 +1401,15 @@ 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.sample != _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 ); @@ -1375,13 +1418,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* @@ -1390,7 +1431,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; @@ -1399,35 +1440,39 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, output_chan = _editor->session()->master_out()->n_inputs().n_audio(); } 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 dynamic_cast(tav); + tav =_editor->time_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(), + 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); - TimeAxisView* tav = _editor->axis_view_from_stripable (midi_tracks.front()); - if (tav) { - tav->set_height (original->current_height()); - } - return dynamic_cast (tav); + tav = _editor->time_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, int32_t const ev_state) +RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, MusicSample last_position, int32_t const ev_state) { RegionSelection new_views; PlaylistSet modified_playlists; RouteTimeAxisView* new_time_axis_view = 0; + samplecnt_t const drag_delta = _primary->region()->position() - _last_position.sample; + + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_sample (last_position.sample, last_position.division); + const double qn_delta = _primary->region()->quarter_note() - last_pos_qn; if (_brushing) { /* all changes were made during motion event handlers */ @@ -1452,12 +1497,16 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed continue; } - framepos_t where; + MusicSample 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()) { @@ -1468,6 +1517,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 { @@ -1480,8 +1533,19 @@ 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, _editor->get_grid_music_divisions (ev_state)); + 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); @@ -1516,7 +1580,7 @@ void RegionMoveDrag::finished_no_copy ( bool const changed_position, bool const changed_tracks, - framecnt_t const drag_delta, + MusicSample last_position, int32_t const ev_state ) { @@ -1525,10 +1589,15 @@ RegionMoveDrag::finished_no_copy ( PlaylistSet frozen_playlists; set views_to_update; RouteTimeAxisView* new_time_axis_view = 0; + samplecnt_t const drag_delta = _primary->region()->position() - last_position.sample; typedef map, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_sample (last_position.sample, 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(); ) { @@ -1555,6 +1624,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 { @@ -1573,22 +1646,40 @@ RegionMoveDrag::finished_no_copy ( views_to_update.insert (dest_rtv); - framepos_t where; + MusicSample 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 && !_x_constrained) { + 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, _editor->get_grid_music_divisions (ev_state) - ); + 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; @@ -1646,8 +1737,17 @@ RegionMoveDrag::finished_no_copy ( if (r.second) { playlist->freeze (); } - - rv->region()->set_position (where, _editor->get_grid_music_divisions (ev_state)); + if (rv == _primary) { + rv->region()->set_position (where.sample, last_position.division); + } else { + if (rv->region()->position_lock_style() == AudioTime) { + /* move by sample offset */ + rv->region()->set_position (where.sample, 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())); } @@ -1747,11 +1847,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, - const int32_t sub_num + RouteTimeAxisView* dest_rtv, + layer_t dest_layer, + MusicSample where, + double quarter_note, + PlaylistSet& modified_playlists, + bool for_music ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); @@ -1768,7 +1869,11 @@ RegionMoveDrag::insert_region_into_playlist ( if (r.second) { dest_playlist->clear_changes (); } - dest_playlist->add_region (region, where, 1.0, false, sub_num); + if (for_music) { + dest_playlist->add_region (region, where.sample, 1.0, false, where.division, quarter_note, true); + } else { + dest_playlist->add_region (region, where.sample, 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); @@ -1857,22 +1962,16 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, { DEBUG_TRACE (DEBUG::Drags, "New RegionMoveDrag\n"); - double speed = 1; - RouteTimeAxisView* rtv = dynamic_cast (&_primary->get_time_axis_view ()); - if (rtv && rtv->is_track()) { - speed = rtv->track()->speed (); - } - - _last_frame_position = static_cast (_primary->region()->position() / speed); + _last_position = MusicSample (_primary->region()->position(), 0); } void -RegionMoveDrag::setup_pointer_frame_offset () +RegionMoveDrag::setup_pointer_sample_offset () { - _pointer_frame_offset = raw_grab_frame() - _last_frame_position; + _pointer_sample_offset = raw_grab_sample() - _last_position.sample; } -RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, RouteTimeAxisView* v, framepos_t pos) +RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, RouteTimeAxisView* v, samplepos_t pos) : RegionMotionDrag (e, 0, 0, list (), false) { DEBUG_TRACE (DEBUG::Drags, "New RegionInsertDrag\n"); @@ -1886,7 +1985,7 @@ 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 = MusicSample (pos, 0); _item = _primary->get_canvas_group (); } @@ -1906,11 +2005,13 @@ RegionInsertDrag::finished (GdkEvent * event, 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.sample, 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.sample, _primary->region()->length(), _primary->region()); } _editor->session()->add_command (new StatefulDiffCommand (playlist)); @@ -1974,7 +2075,7 @@ RegionSpliceDrag::motion (GdkEvent* event, bool) RegionSelection copy; _editor->selection->regions.by_position(copy); - framepos_t const pf = adjusted_current_frame (event); + samplepos_t const pf = adjusted_current_sample (event); for (RegionSelection::iterator i = copy.begin(); i != copy.end(); ++i) { @@ -1995,11 +2096,11 @@ RegionSpliceDrag::motion (GdkEvent* event, bool) } if (dir > 0) { - if (pf < (*i)->region()->last_frame() + 1) { + if (pf < (*i)->region()->last_sample() + 1) { continue; } } else { - if (pf > (*i)->region()->first_frame()) { + if (pf > (*i)->region()->first_sample()) { continue; } } @@ -2026,10 +2127,10 @@ RegionSpliceDrag::aborted (bool) */ void -RegionRippleDrag::add_all_after_to_views(TimeAxisView *tav, framepos_t where, const RegionSelection &exclude, bool drag_in_progress) +RegionRippleDrag::add_all_after_to_views(TimeAxisView *tav, samplepos_t where, const RegionSelection &exclude, bool drag_in_progress) { - boost::shared_ptr rl = tav->playlist()->regions_with_start_within (Evoral::Range(where, max_framepos)); + boost::shared_ptr rl = tav->playlist()->regions_with_start_within (Evoral::Range(where, max_samplepos)); RouteTimeAxisView* rtv = dynamic_cast(tav); RegionSelection to_ripple; @@ -2066,7 +2167,7 @@ RegionRippleDrag::add_all_after_to_views(TimeAxisView *tav, framepos_t where, co } void -RegionRippleDrag::remove_unselected_from_views(framecnt_t amount, bool move_regions) +RegionRippleDrag::remove_unselected_from_views(samplecnt_t amount, bool move_regions) { for (std::list::iterator i = _views.begin(); i != _views.end(); ) { @@ -2121,7 +2222,7 @@ RegionRippleDrag::RegionRippleDrag (Editor* e, ArdourCanvas::Item* i, RegionView DEBUG_TRACE (DEBUG::Drags, "New RegionRippleDrag\n"); // compute length of selection RegionSelection selected_regions = _editor->selection->regions; - selection_length = selected_regions.end_frame() - selected_regions.start(); + selection_length = selected_regions.end_sample() - selected_regions.start(); // we'll only allow dragging to another track in ripple mode if all the regions // being dragged start off on the same track @@ -2185,17 +2286,17 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) return; } - framepos_t where = adjusted_current_frame (event); + samplepos_t where = adjusted_current_sample (event); assert (where >= 0); - framepos_t after; + MusicSample after (0, 0); double delta = compute_x_delta (event, &after); - framecnt_t amount = _editor->pixel_to_sample (delta); + samplecnt_t amount = _editor->pixel_to_sample (delta); if (allow_moves_across_tracks) { // all the originally selected regions were on the same track - framecnt_t adjust = 0; + samplecnt_t adjust = 0; if (prev_tav && tv != prev_tav) { // dragged onto a different track // remove the unselected regions from _views, restore them to their original positions @@ -2237,7 +2338,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) prev_amount += amount; } - _last_frame_position = after; + _last_position = after; } void @@ -2249,8 +2350,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; @@ -2317,26 +2417,29 @@ RegionCreateDrag::RegionCreateDrag (Editor* e, ArdourCanvas::Item* i, TimeAxisVi void RegionCreateDrag::motion (GdkEvent* event, bool first_move) { + if (first_move) { _editor->begin_reversible_command (_("create region")); - _region = add_midi_region (_view, false, _editor->get_grid_music_divisions (event->button.state)); + _region = add_midi_region (_view, false); _view->playlist()->freeze (); } else { + if (_region) { - framepos_t const f = adjusted_current_frame (event); - if (f < grab_frame()) { + samplepos_t const f = adjusted_current_sample (event); + if (f <= grab_sample()) { _region->set_initial_position (f); } - /* Don't use a zero-length region, and subtract 1 frame from the snapped length + /* Don't use a zero-length region, and subtract 1 sample from the snapped length so that if this region is duplicated, its duplicate starts on - a snap point rather than 1 frame after a snap point. Otherwise things get - a bit confusing as if a region starts 1 frame after a snap point, one cannot + a snap point rather than 1 sample after a snap point. Otherwise things get + a bit confusing as if a region starts 1 sample after a snap point, one cannot place snapped notes at the start of the region. */ - - framecnt_t const len = (framecnt_t) fabs ((double)(f - grab_frame () - 1)); - _region->set_length (len < 1 ? 1 : len, _editor->get_grid_music_divisions (event->button.state)); + if (f != grab_sample()) { + samplecnt_t const len = (samplecnt_t) fabs ((double)(f - grab_sample () - 1)); + _region->set_length (len < 1 ? 1 : len, _editor->get_grid_music_divisions (event->button.state)); + } } } } @@ -2345,7 +2448,7 @@ void RegionCreateDrag::finished (GdkEvent* event, bool movement_occurred) { if (!movement_occurred) { - add_midi_region (_view, true, _editor->get_grid_music_divisions (event->button.state)); + add_midi_region (_view, true); } else { _view->playlist()->thaw (); _editor->commit_reversible_command(); @@ -2590,7 +2693,7 @@ VideoTimeLineDrag::VideoTimeLineDrag (Editor* e, ArdourCanvas::Item* i) RegionSelection rs; TrackViewList empty; empty.clear(); - _editor->get_regions_after(rs, (framepos_t) 0, empty); + _editor->get_regions_after(rs, (samplepos_t) 0, empty); std::list views = rs.by_layer(); _stuck = false; @@ -2633,7 +2736,7 @@ VideoTimeLineDrag::start_grab (GdkEvent* event, Gdk::Cursor*) for (list::iterator i = _views.begin(); i != _views.end(); ++i) { if (i->initial_position < _max_backwards_drag || _max_backwards_drag < 0) { - _max_backwards_drag = ARDOUR_UI::instance()->video_timeline->quantify_frames_to_apv (i->initial_position); + _max_backwards_drag = ARDOUR_UI::instance()->video_timeline->quantify_samples_to_apv (i->initial_position); } } DEBUG_TRACE (DEBUG::Drags, string_compose("VideoTimeLineDrag: max backwards-drag: %1\n", _max_backwards_drag)); @@ -2659,8 +2762,8 @@ VideoTimeLineDrag::motion (GdkEvent* event, bool first_move) return; } - framecnt_t dt = adjusted_current_frame (event) - raw_grab_frame() + _pointer_frame_offset; - dt = ARDOUR_UI::instance()->video_timeline->quantify_frames_to_apv(_startdrag_video_offset+dt) - _startdrag_video_offset; + samplecnt_t dt = adjusted_current_sample (event) - raw_grab_sample() + _pointer_sample_offset; + dt = ARDOUR_UI::instance()->video_timeline->quantify_samples_to_apv(_startdrag_video_offset+dt) - _startdrag_video_offset; if (_max_backwards_drag >= 0 && dt <= - _max_backwards_drag) { dt = - _max_backwards_drag; @@ -2681,7 +2784,7 @@ VideoTimeLineDrag::motion (GdkEvent* event, bool first_move) rv->region_changed(ARDOUR::Properties::position); } - const framepos_t offset = ARDOUR_UI::instance()->video_timeline->get_offset(); + const samplepos_t offset = ARDOUR_UI::instance()->video_timeline->get_offset(); Timecode::Time timecode; Timecode::Time timediff; char buf[128]; @@ -2729,8 +2832,8 @@ VideoTimeLineDrag::finished (GdkEvent * /*event*/, bool movement_occurred) } _editor->session()->maybe_update_session_range( - std::max(ARDOUR_UI::instance()->video_timeline->get_offset(), (ARDOUR::frameoffset_t) 0), - std::max(ARDOUR_UI::instance()->video_timeline->get_offset() + ARDOUR_UI::instance()->video_timeline->get_duration(), (ARDOUR::frameoffset_t) 0) + std::max(ARDOUR_UI::instance()->video_timeline->get_offset(), (ARDOUR::sampleoffset_t) 0), + std::max(ARDOUR_UI::instance()->video_timeline->get_offset() + ARDOUR_UI::instance()->video_timeline->get_duration(), (ARDOUR::sampleoffset_t) 0) ); @@ -2764,20 +2867,14 @@ TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, listget_time_axis_view (); - RouteTimeAxisView* tv = dynamic_cast(tvp); - if (tv && tv->is_track()) { - speed = tv->track()->speed(); - } - - framepos_t const region_start = (framepos_t) (_primary->region()->position() / speed); - framepos_t const region_end = (framepos_t) (_primary->region()->last_frame() / speed); - framecnt_t const region_length = (framecnt_t) (_primary->region()->length() / speed); + samplepos_t const region_start = _primary->region()->position(); + samplepos_t const region_end = _primary->region()->last_sample(); + samplecnt_t const region_length = _primary->region()->length(); - framepos_t const pf = adjusted_current_frame (event); - setup_snap_delta (region_start); + samplepos_t const pf = adjusted_current_sample (event); + setup_snap_delta (MusicSample(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 */ @@ -2831,17 +2928,12 @@ TrimDrag::motion (GdkEvent* event, bool first_move) { RegionView* rv = _primary; - double speed = 1.0; TimeAxisView* tvp = &_primary->get_time_axis_view (); - RouteTimeAxisView* tv = dynamic_cast(tvp); pair >::iterator,bool> insert_result; - frameoffset_t frame_delta = 0; + sampleoffset_t sample_delta = 0; - 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); + MusicSample adj_sample = adjusted_sample (_drags->current_pointer_sample () + snap_delta (event->button.state), event, true); + samplecnt_t dt = adj_sample.sample - raw_grab_sample () + _pointer_sample_offset - snap_delta (event->button.state); if (first_move) { @@ -2885,6 +2977,24 @@ TrimDrag::motion (GdkEvent* event, bool first_move) if (insert_result.second) { pl->freeze(); } + + MidiRegionView* const mrv = dynamic_cast (rv); + /* a MRV start trim may change the source length. ensure we cover all playlists here */ + if (mrv && _operation == StartTrim) { + vector > all_playlists; + _editor->session()->playlists->get (all_playlists); + for (vector >::iterator x = all_playlists.begin(); x != all_playlists.end(); ++x) { + + if ((*x)->uses_source (rv->region()->source(0))) { + insert_result = _editor->motion_frozen_playlists.insert (*x); + if (insert_result.second) { + (*x)->clear_owned_changes (); + (*x)->freeze(); + } + + } + } + } } } @@ -2903,7 +3013,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) if (!arv) continue; boost::shared_ptr ar (arv->audio_region()); if (ar->locked()) continue; - framecnt_t len = ar->fade_in()->back()->when; + samplecnt_t len = ar->fade_in()->back()->when; if (len < dt) dt = min(dt, len); } break; @@ -2913,7 +3023,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) if (!arv) continue; boost::shared_ptr ar (arv->audio_region()); if (ar->locked()) continue; - framecnt_t len = ar->fade_out()->back()->when; + samplecnt_t len = ar->fade_out()->back()->when; if (len < -dt) dt = max(dt, -len); } break; @@ -2922,20 +3032,19 @@ 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 - , _editor->get_grid_music_divisions (event->button.state)); + , adj_sample.division); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { boost::shared_ptr ar (arv->audio_region()); - framecnt_t len = ar->fade_in()->back()->when; - framecnt_t diff = ar->first_frame() - i->initial_position; - framepos_t new_length = len - diff; + samplecnt_t len = ar->fade_in()->back()->when; + samplecnt_t diff = ar->first_sample() - i->initial_position; + samplepos_t new_length = len - diff; i->anchored_fade_length = min (ar->length(), new_length); //i->anchored_fade_length = ar->verify_xfade_bounds (new_length, true /*START*/ ); arv->reset_fade_in_shape_width (ar, i->anchored_fade_length, true); @@ -2946,14 +3055,14 @@ 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, _editor->get_grid_music_divisions (event->button.state)); + bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, adj_sample.division); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { boost::shared_ptr ar (arv->audio_region()); - framecnt_t len = ar->fade_out()->back()->when; - framecnt_t diff = 1 + ar->last_frame() - i->initial_end; - framepos_t new_length = len + diff; + samplecnt_t len = ar->fade_out()->back()->when; + samplecnt_t diff = 1 + ar->last_sample() - i->initial_end; + samplepos_t new_length = len + diff; i->anchored_fade_length = min (ar->length(), new_length); //i->anchored_fade_length = ar->verify_xfade_bounds (new_length, false /*END*/ ); arv->reset_fade_out_shape_width (ar, i->anchored_fade_length, true); @@ -2964,10 +3073,10 @@ TrimDrag::motion (GdkEvent* event, bool first_move) case ContentsTrim: { - frame_delta = (last_pointer_frame() - adjusted_current_frame(event)); + sample_delta = (last_pointer_sample() - adjusted_current_sample(event)); for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - i->view->move_contents (frame_delta); + i->view->move_contents (sample_delta); } } break; @@ -2975,13 +3084,13 @@ TrimDrag::motion (GdkEvent* event, bool first_move) switch (_operation) { case StartTrim: - show_verbose_cursor_time ((framepos_t) (rv->region()->position() / speed)); + show_verbose_cursor_time (rv->region()->position()); break; case EndTrim: - show_verbose_cursor_duration ((framepos_t) rv->region()->position() / speed, (framepos_t) rv->region()->last_frame() / speed); + show_verbose_cursor_duration (rv->region()->position(), rv->region()->last_sample()); break; case ContentsTrim: - // show_verbose_cursor_time (frame_delta); + // show_verbose_cursor_time (sample_delta); break; } } @@ -3031,44 +3140,25 @@ 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 { - - set > diffed_playlists; - for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { i->view->thaw_after_trim (); i->view->enable_display (true); - - /* Trimming one region may affect others on the playlist, so we need - to get undo Commands from the whole playlist rather than just the - region. Use diffed_playlists to make sure we don't diff a given - playlist more than once. - */ - boost::shared_ptr p = i->view->region()->playlist (); - if (diffed_playlists.find (p) == diffed_playlists.end()) { - vector cmds; - p->rdiff (cmds); - _editor->session()->add_commands (cmds); - diffed_playlists.insert (p); - } } } for (set >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) { + /* Trimming one region may affect others on the playlist, so we need + to get undo Commands from the whole playlist rather than just the + region. Use motion_frozen_playlists (a set) to make sure we don't + diff a given playlist more than once. + */ + + vector cmds; + (*p)->rdiff (cmds); + _editor->session()->add_commands (cmds); (*p)->thaw (); } @@ -3077,8 +3167,8 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } else { /* no mouse movement */ - if (adjusted_current_frame (event) != adjusted_frame (_drags->current_pointer_frame(), event, false)) { - _editor->point_trim (event, adjusted_current_frame (event)); + if (adjusted_current_sample (event) != adjusted_sample (_drags->current_pointer_sample(), event, false).sample) { + _editor->point_trim (event, adjusted_current_sample (event)); } } @@ -3108,7 +3198,7 @@ TrimDrag::aborted (bool movement_occurred) } void -TrimDrag::setup_pointer_frame_offset () +TrimDrag::setup_pointer_sample_offset () { list::iterator i = _views.begin (); while (i != _views.end() && i->view != _primary) { @@ -3121,10 +3211,10 @@ TrimDrag::setup_pointer_frame_offset () switch (_operation) { case StartTrim: - _pointer_frame_offset = raw_grab_frame() - i->initial_position; + _pointer_sample_offset = raw_grab_sample() - i->initial_position; break; case EndTrim: - _pointer_frame_offset = raw_grab_frame() - i->initial_end; + _pointer_sample_offset = raw_grab_sample() - i->initial_end; break; case ContentsTrim: break; @@ -3134,7 +3224,7 @@ TrimDrag::setup_pointer_frame_offset () MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) : Drag (e, i) , _copy (c) - , _old_snap_type (e->snap_type()) + , _old_grid_type (e->grid_type()) , _old_snap_mode (e->snap_mode()) , before_state (0) { @@ -3149,13 +3239,13 @@ void MeterMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Drag::start_grab (event, cursor); - show_verbose_cursor_time (adjusted_current_frame(event)); + show_verbose_cursor_time (adjusted_current_sample(event)); } void -MeterMarkerDrag::setup_pointer_frame_offset () +MeterMarkerDrag::setup_pointer_sample_offset () { - _pointer_frame_offset = raw_grab_frame() - _marker->meter().frame(); + _pointer_sample_offset = raw_grab_sample() - _marker->meter().sample(); } void @@ -3191,14 +3281,14 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) Timecode::BBT_Time bbt = _real_section->bbt(); /* we can't add a meter where one currently exists */ - if (_real_section->frame() < adjusted_current_frame (event, false)) { + if (_real_section->sample() < adjusted_current_sample (event, false)) { ++bbt.bars; } else { --bbt.bars; } - const double beat = map.beat_at_bbt (bbt); + const samplepos_t sample = map.sample_at_bbt (bbt); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) - , beat, bbt, _real_section->position_lock_style()); + , bbt, sample, _real_section->position_lock_style()); if (!_real_section) { aborted (true); return; @@ -3207,24 +3297,25 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) } /* 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); + _editor->set_grid_to (GridTypeBar); + _editor->set_snap_mode (SnapMagnetic); } } - framepos_t pf = adjusted_current_frame (event); + samplepos_t pf = adjusted_current_sample (event); - if (_real_section->position_lock_style() == AudioTime && _editor->snap_musical()) { + if (_real_section->position_lock_style() == AudioTime && _editor->grid_musical()) { /* never snap to music for audio locked */ - pf = adjusted_current_frame (event, false); + pf = adjusted_current_sample (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)); + _marker->set_position (adjusted_current_sample (event, false)); - show_verbose_cursor_time (_real_section->frame()); + show_verbose_cursor_time (_real_section->sample()); + _editor->set_snapped_cursor_position(_real_section->sample()); } void @@ -3238,7 +3329,7 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred) } /* reinstate old snap setting */ - _editor->set_snap_to (_old_snap_type); + _editor->set_grid_to (_old_grid_type); _editor->set_snap_mode (_old_snap_mode); TempoMap& map (_editor->session()->tempo_map()); @@ -3255,10 +3346,10 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred) void MeterMarkerDrag::aborted (bool moved) { - _marker->set_position (_marker->meter().frame ()); + _marker->set_position (_marker->meter().sample ()); if (moved) { /* reinstate old snap setting */ - _editor->set_snap_to (_old_snap_type); + _editor->set_grid_to (_old_grid_type); _editor->set_snap_mode (_old_snap_mode); _editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version); @@ -3271,15 +3362,17 @@ 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) + , _grab_bpm (120.0, 4.0) + , _grab_qn (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(); - _grab_bpm = _real_section->note_types_per_minute(); + _movable = !_real_section->initial(); + _grab_bpm = Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), _real_section->end_note_types_per_minute()); + _grab_qn = _real_section->pulse() * 4.0; assert (_marker); } @@ -3290,14 +3383,14 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) if (!_real_section->active()) { show_verbose_cursor_text (_("inactive")); } else { - show_verbose_cursor_time (adjusted_current_frame (event)); + show_verbose_cursor_time (adjusted_current_sample (event)); } } void -TempoMarkerDrag::setup_pointer_frame_offset () +TempoMarkerDrag::setup_pointer_sample_offset () { - _pointer_frame_offset = raw_grab_frame() - _real_section->frame(); + _pointer_sample_offset = raw_grab_sample() - _real_section->sample(); } void @@ -3306,6 +3399,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) if (!_real_section->active()) { return; } + TempoMap& map (_editor->session()->tempo_map()); if (first_move) { @@ -3328,25 +3422,23 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME); _marker->hide(); - TempoMap& map (_editor->session()->tempo_map()); /* get current state */ - before_state = &map.get_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(); + const samplepos_t sample = adjusted_current_sample (event) + 1; _editor->begin_reversible_command (_("copy tempo mark")); if (_real_section->position_lock_style() == 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); + _real_section = map.add_tempo (tempo, map.exact_qn_at_sample (sample, divisions), 0, MusicTime); } else { - _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime); + _real_section = map.add_tempo (tempo, 0.0, sample, AudioTime); } if (!_real_section) { @@ -3356,37 +3448,42 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) } } + if (ArdourKeyboard::indicates_constraint (event->button.state) && ArdourKeyboard::indicates_copy (event->button.state)) { + double new_bpm = max (1.5, _grab_bpm.end_note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); + stringstream strs; + _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), new_bpm)); + strs << "end:" << fixed << setprecision(3) << new_bpm; + show_verbose_cursor_text (strs.str()); - if (ArdourKeyboard::indicates_constraint (event->button.state)) { + } else if (ArdourKeyboard::indicates_constraint (event->button.state)) { /* use vertical movement to alter tempo .. should be log */ - double new_bpm = max (1.5, _grab_bpm + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); + double new_bpm = max (1.5, _grab_bpm.note_types_per_minute() + ((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; + _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type(), _real_section->end_note_types_per_minute())); + strs << "start:" << fixed << setprecision(3) << new_bpm; show_verbose_cursor_text (strs.str()); } else if (_movable && !_real_section->locked_to_meter()) { - framepos_t pf; + samplepos_t pf; - if (_editor->snap_musical()) { + if (_editor->grid_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); + pf = adjusted_current_sample (event, false); } else { - pf = adjusted_current_frame (event); + pf = adjusted_current_sample (event); } - TempoMap& map (_editor->session()->tempo_map()); - /* snap to beat is 1, snap to bar is -1 (sorry) */ const int sub_num = _editor->get_grid_music_divisions (event->button.state); - map.gui_move_tempo (_real_section, pf, sub_num); + map.gui_set_tempo_position (_real_section, pf, sub_num); - show_verbose_cursor_time (_real_section->frame()); + show_verbose_cursor_time (_real_section->sample()); + _editor->set_snapped_cursor_position(_real_section->sample()); } - _marker->set_position (adjusted_current_frame (event, false)); + _marker->set_position (adjusted_current_sample (event, false)); } void @@ -3405,7 +3502,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) TempoMap& map (_editor->session()->tempo_map()); XMLNode &after = map.get_state(); - _editor->session()->add_command (new MementoCommand(map, before_state, &after)); + _editor->session()->add_command (new MementoCommand(map, _before_state, &after)); _editor->commit_reversible_command (); // delete the dummy marker we used for visual representation while moving. @@ -3416,10 +3513,10 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) void TempoMarkerDrag::aborted (bool moved) { - _marker->set_position (_marker->tempo().frame()); + _marker->set_position (_marker->tempo().sample()); if (moved) { TempoMap& map (_editor->session()->tempo_map()); - map.set_state (*before_state, Stateful::current_state_version); + map.set_state (*_before_state, Stateful::current_state_version); // delete the dummy (hidden) marker we used for events while moving. delete _marker; } @@ -3429,7 +3526,8 @@ BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i) , _grab_qn (0.0) , _tempo (0) - , before_state (0) + , _before_state (0) + , _drag_valid (true) { DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n"); @@ -3440,65 +3538,88 @@ 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())); + _tempo = const_cast (&map.tempo_section_at_sample (raw_grab_sample())); + + if (adjusted_current_sample (event, false) <= _tempo->sample()) { + _drag_valid = false; + return; + } + + _editor->tempo_curve_selected (_tempo, true); + ostringstream sstr; + if (_tempo->clamped()) { + TempoSection* prev = map.previous_tempo_section (_tempo); + if (prev) { + sstr << "end: " << fixed << setprecision(3) << prev->end_note_types_per_minute() << "\n"; + } + } - 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(); + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); - finished (event, false); } void -BBTRulerDrag::setup_pointer_frame_offset () +BBTRulerDrag::setup_pointer_sample_offset () { TempoMap& map (_editor->session()->tempo_map()); - const double beat_at_frame = max (0.0, map.beat_at_frame (raw_grab_frame())); + /* get current state */ + _before_state = &map.get_state(); + + const double beat_at_sample = max (0.0, map.beat_at_sample (raw_grab_sample())); 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_sample) + (floor (((beat_at_sample - floor (beat_at_sample)) * 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_sample) + (floor (((beat_at_sample - floor (beat_at_sample)) * 4)) / 4); } _grab_qn = map.quarter_note_at_beat (beat); - _pointer_frame_offset = raw_grab_frame() - map.frame_at_quarter_note (_grab_qn); + _pointer_sample_offset = raw_grab_sample() - map.sample_at_quarter_note (_grab_qn); } void BBTRulerDrag::motion (GdkEvent* event, bool first_move) { - TempoMap& map (_editor->session()->tempo_map()); + if (!_drag_valid) { + return; + } 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 pf; + TempoMap& map (_editor->session()->tempo_map()); + samplepos_t pf; - if (_editor->snap_musical()) { - pf = adjusted_current_frame (event, false); + if (_editor->grid_musical()) { + pf = adjusted_current_sample (event, false); } else { - pf = adjusted_current_frame (event); + pf = adjusted_current_sample (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_quarter_note (_grab_qn), pf); + /* adjust previous tempo to match pointer sample */ + _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.sample_at_quarter_note (_grab_qn), pf, _grab_qn, map.quarter_note_at_sample (pf)); } + ostringstream sstr; - sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).note_types_per_minute() << "\n"; - sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute(); + if (_tempo->clamped()) { + TempoSection* prev = map.previous_tempo_section (_tempo); + if (prev) { + _editor->tempo_curve_selected (prev, true); + sstr << "end: " << fixed << setprecision(3) << prev->end_note_types_per_minute() << "\n"; + } + } + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3511,19 +3632,272 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred) TempoMap& map (_editor->session()->tempo_map()); + _editor->tempo_curve_selected (_tempo, false); + if (_tempo->clamped()) { + TempoSection* prev_tempo = map.previous_tempo_section (_tempo); + if (prev_tempo) { + _editor->tempo_curve_selected (prev_tempo, false); + } + } + + if (!movement_occurred || !_drag_valid) { + return; + } + XMLNode &after = map.get_state(); - _editor->session()->add_command(new MementoCommand(map, before_state, &after)); + _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); + _editor->session()->tempo_map().set_state (*_before_state, Stateful::current_state_version); + } +} + +TempoTwistDrag::TempoTwistDrag (Editor* e, ArdourCanvas::Item* i) + : Drag (e, i) + , _grab_qn (0.0) + , _grab_tempo (0.0) + , _tempo (0) + , _next_tempo (0) + , _drag_valid (true) + , _before_state (0) +{ + DEBUG_TRACE (DEBUG::Drags, "New TempoTwistDrag\n"); + +} + +void +TempoTwistDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + TempoMap& map (_editor->session()->tempo_map()); + /* get current state */ + _before_state = &map.get_state(); + _tempo = const_cast (&map.tempo_section_at_sample (raw_grab_sample())); + + if (_tempo->locked_to_meter()) { + _drag_valid = false; + return; + } + + _next_tempo = map.next_tempo_section (_tempo); + if (_next_tempo) { + if (!map.next_tempo_section (_next_tempo)) { + _drag_valid = false; + finished (event, false); + + return; + } + _editor->tempo_curve_selected (_tempo, true); + _editor->tempo_curve_selected (_next_tempo, true); + + ostringstream sstr; + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; + sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute() << "\n"; + sstr << "start: " << fixed << setprecision(3) << _next_tempo->note_types_per_minute(); + show_verbose_cursor_text (sstr.str()); + } else { + _drag_valid = false; + } + + _grab_tempo = Tempo (_tempo->note_types_per_minute(), _tempo->note_type()); +} + +void +TempoTwistDrag::setup_pointer_sample_offset () +{ + TempoMap& map (_editor->session()->tempo_map()); + const double beat_at_sample = max (0.0, map.beat_at_sample (raw_grab_sample())); + const uint32_t divisions = _editor->get_grid_beat_divisions (0); + double beat = 0.0; + + if (divisions > 0) { + beat = floor (beat_at_sample) + (floor (((beat_at_sample - floor (beat_at_sample)) * 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_sample) + (floor (((beat_at_sample - floor (beat_at_sample)) * 4)) / 4); + } + + _grab_qn = map.quarter_note_at_beat (beat); + + _pointer_sample_offset = raw_grab_sample() - map.sample_at_quarter_note (_grab_qn); + +} + +void +TempoTwistDrag::motion (GdkEvent* event, bool first_move) +{ + + if (!_next_tempo || !_drag_valid) { + return; + } + + TempoMap& map (_editor->session()->tempo_map()); + + if (first_move) { + _editor->begin_reversible_command (_("twist tempo")); + } + + samplepos_t pf; + + if (_editor->grid_musical()) { + pf = adjusted_current_sample (event, false); + } else { + pf = adjusted_current_sample (event); + } + + /* adjust this and the next tempi to match pointer sample */ + double new_bpm = max (1.5, _grab_tempo.note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); + _editor->session()->tempo_map().gui_twist_tempi (_tempo, new_bpm, map.sample_at_quarter_note (_grab_qn), pf); + + ostringstream sstr; + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; + sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute() << "\n"; + sstr << "start: " << fixed << setprecision(3) << _next_tempo->note_types_per_minute(); + show_verbose_cursor_text (sstr.str()); +} + +void +TempoTwistDrag::finished (GdkEvent* event, bool movement_occurred) +{ + if (!movement_occurred || !_drag_valid) { + return; + } + + _editor->tempo_curve_selected (_tempo, false); + _editor->tempo_curve_selected (_next_tempo, false); + + 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 +TempoTwistDrag::aborted (bool moved) +{ + if (moved) { + _editor->session()->tempo_map().set_state (*_before_state, Stateful::current_state_version); + } +} + +TempoEndDrag::TempoEndDrag (Editor* e, ArdourCanvas::Item* i) + : Drag (e, i) + , _grab_qn (0.0) + , _tempo (0) + , _before_state (0) + , _drag_valid (true) +{ + DEBUG_TRACE (DEBUG::Drags, "New TempoEndDrag\n"); + TempoMarker* marker = reinterpret_cast (_item->get_data ("marker")); + _tempo = &marker->tempo(); + _grab_qn = _tempo->pulse() * 4.0; +} + +void +TempoEndDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + TempoMap& tmap (_editor->session()->tempo_map()); + + /* get current state */ + _before_state = &tmap.get_state(); + + if (_tempo->locked_to_meter()) { + _drag_valid = false; + return; + } + + ostringstream sstr; + + TempoSection* prev = 0; + if ((prev = tmap.previous_tempo_section (_tempo)) != 0) { + _editor->tempo_curve_selected (tmap.previous_tempo_section (_tempo), true); + sstr << "end: " << fixed << setprecision(3) << tmap.tempo_section_at_sample (_tempo->sample() - 1).end_note_types_per_minute() << "\n"; + } + + if (_tempo->clamped()) { + _editor->tempo_curve_selected (_tempo, true); + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute(); + } + + show_verbose_cursor_text (sstr.str()); +} + +void +TempoEndDrag::setup_pointer_sample_offset () +{ + TempoMap& map (_editor->session()->tempo_map()); + + _pointer_sample_offset = raw_grab_sample() - map.sample_at_quarter_note (_grab_qn); + +} + +void +TempoEndDrag::motion (GdkEvent* event, bool first_move) +{ + if (!_drag_valid) { + return; + } + + TempoMap& map (_editor->session()->tempo_map()); + + if (first_move) { + _editor->begin_reversible_command (_("stretch end tempo")); + } + + samplepos_t const pf = adjusted_current_sample (event, false); + map.gui_stretch_tempo_end (&map.tempo_section_at_sample (_tempo->sample() - 1), map.sample_at_quarter_note (_grab_qn), pf); + + ostringstream sstr; + sstr << "end: " << fixed << setprecision(3) << map.tempo_section_at_sample (_tempo->sample() - 1).end_note_types_per_minute() << "\n"; + + if (_tempo->clamped()) { + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute(); } + + show_verbose_cursor_text (sstr.str()); } +void +TempoEndDrag::finished (GdkEvent* event, bool movement_occurred) +{ + if (!movement_occurred || !_drag_valid) { + return; + } + + TempoMap& tmap (_editor->session()->tempo_map()); + + XMLNode &after = tmap.get_state(); + _editor->session()->add_command(new MementoCommand(tmap, _before_state, &after)); + _editor->commit_reversible_command (); + + TempoSection* prev = 0; + if ((prev = tmap.previous_tempo_section (_tempo)) != 0) { + _editor->tempo_curve_selected (prev, false); + } + + if (_tempo->clamped()) { + _editor->tempo_curve_selected (_tempo, false); + + } +} + +void +TempoEndDrag::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) @@ -3539,7 +3913,7 @@ CursorDrag::CursorDrag (Editor* e, EditorCursor& c, bool s) * the diskstream buffers to be refilled, which is too slow). */ void -CursorDrag::fake_locate (framepos_t t) +CursorDrag::fake_locate (samplepos_t t) { if (_editor->session () == 0) { return; @@ -3549,7 +3923,7 @@ CursorDrag::fake_locate (framepos_t t) Session* s = _editor->session (); if (s->timecode_transmission_suspended ()) { - framepos_t const f = _editor->playhead_cursor->current_frame (); + samplepos_t const f = _editor->playhead_cursor->current_sample (); /* This is asynchronous so it will be sent "now" */ s->send_mmc_locate (f); @@ -3568,15 +3942,15 @@ 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 (MusicSample (_editor->playhead_cursor->current_sample(), 0)); _grab_zoom = _editor->samples_per_pixel; - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicSample where (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); _editor->snap_to_with_modifier (where, event); - _editor->_dragging_playhead = true; + _editor->_control_scroll_target = where.sample; Session* s = _editor->session (); @@ -3594,7 +3968,7 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) } - if (AudioEngine::instance()->connected()) { + if (AudioEngine::instance()->running()) { /* do this only if we're the engine is connected * because otherwise this request will never be @@ -3604,22 +3978,59 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) */ s->request_suspend_timecode_transmission (); - while (AudioEngine::instance()->connected() && !s->timecode_transmission_suspended ()) { + while (AudioEngine::instance()->running() && !s->timecode_transmission_suspended ()) { /* twiddle our thumbs */ } } } - fake_locate (where - snap_delta (event->button.state)); + fake_locate (where.sample - snap_delta (event->button.state)); + + _last_y_delta = 0; } void CursorDrag::motion (GdkEvent* event, bool) { - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicSample 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.sample != last_pointer_sample()) { + fake_locate (where.sample - snap_delta (event->button.state)); + } + + //maybe do zooming, too, if the option is enabled + if (UIConfiguration::instance ().get_use_time_rulers_to_zoom_with_vertical_drag () ) { + + //To avoid accidental zooming, the mouse must move exactly vertical, not diagonal, to trigger a zoom step + //we use screen coordinates for this, not canvas-based grab_x + double mx = event->button.x; + double dx = fabs(mx - _last_mx); + double my = event->button.y; + double dy = fabs(my - _last_my); + + { + //do zooming in windowed "steps" so it feels more reversible ? + const int stepsize = 2; //stepsize ==1 means "trigger on every pixel of movement" + int y_delta = grab_y() - current_pointer_y(); + y_delta = y_delta / stepsize; + + //if all requirements are met, do the actual zoom + const double scale = 1.2; + if ( (dy>dx) && (_last_dx ==0) && (y_delta != _last_y_delta) ) { + if ( _last_y_delta > y_delta ) { + _editor->temporal_zoom_step_mouse_focus_scale (true, scale); + } else { + _editor->temporal_zoom_step_mouse_focus_scale (false, scale); + } + _last_y_delta = y_delta; + } + } + + _last_my = my; + _last_mx = mx; + _last_dx = dx; } } @@ -3638,7 +4049,7 @@ CursorDrag::finished (GdkEvent* event, bool movement_occurred) Session* s = _editor->session (); if (s) { - s->request_locate (_editor->playhead_cursor->current_frame (), _was_rolling); + s->request_locate (_editor->playhead_cursor->current_sample (), _was_rolling); _editor->_pending_locate_request = true; s->request_resume_timecode_transmission (); } @@ -3654,7 +4065,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_sample (grab_sample (), 0, false).sample); } FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) @@ -3670,36 +4081,37 @@ 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 (MusicSample (r->position(), 0)); show_verbose_cursor_duration (r->position(), r->position() + r->fade_in()->back()->when, 32); } void -FadeInDrag::setup_pointer_frame_offset () +FadeInDrag::setup_pointer_sample_offset () { AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr const r = arv->audio_region (); - _pointer_frame_offset = raw_grab_frame() - ((framecnt_t) r->fade_in()->back()->when + r->position()); + _pointer_sample_offset = raw_grab_sample() - ((samplecnt_t) r->fade_in()->back()->when + r->position()); } void FadeInDrag::motion (GdkEvent* event, bool) { - framecnt_t fade_length; + samplecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicSample 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.sample -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.sample < (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.sample > 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.sample - region->position(); } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3723,19 +4135,20 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred) return; } - framecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + samplecnt_t fade_length; + MusicSample 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.sample -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.sample < (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.sample >= 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.sample - region->position(); } bool in_command = false; @@ -3794,36 +4207,36 @@ 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 (MusicSample (r->last_sample(), 0)); - show_verbose_cursor_duration (r->last_frame() - r->fade_out()->back()->when, r->last_frame()); + show_verbose_cursor_duration (r->last_sample() - r->fade_out()->back()->when, r->last_sample()); } void -FadeOutDrag::setup_pointer_frame_offset () +FadeOutDrag::setup_pointer_sample_offset () { AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr r = arv->audio_region (); - _pointer_frame_offset = raw_grab_frame() - (r->length() - (framecnt_t) r->fade_out()->back()->when + r->position()); + _pointer_sample_offset = raw_grab_sample() - (r->length() - (samplecnt_t) r->fade_out()->back()->when + r->position()); } void FadeOutDrag::motion (GdkEvent* event, bool) { - framecnt_t fade_length; + samplecnt_t fade_length; + MusicSample 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.sample -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.sample > (region->last_sample() - 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.sample <= 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_sample() - pos.sample; } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3837,7 +4250,7 @@ FadeOutDrag::motion (GdkEvent* event, bool) tmp->reset_fade_out_shape_width (tmp->audio_region(), fade_length); } - show_verbose_cursor_duration (region->last_frame() - fade_length, region->last_frame()); + show_verbose_cursor_duration (region->last_sample() - fade_length, region->last_sample()); } void @@ -3847,20 +4260,20 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred) return; } - framecnt_t fade_length; + samplecnt_t fade_length; + MusicSample 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.sample -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.sample > (region->last_sample() - 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.sample <= 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_sample() - pos.sample; } bool in_command = false; @@ -3955,7 +4368,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 (MusicSample (is_start ? location->start() : location->end(), 0)); Selection::Operation op = ArdourKeyboard::selection_type (event->button.state); @@ -3973,13 +4386,13 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Locations::LocationList ll; list to_add; - framepos_t s, e; + samplepos_t s, e; _editor->selection->markers.range (s, e); s = min (_marker->position(), s); e = max (_marker->position(), e); s = min (s, e); e = max (s, e); - if (e < max_framepos) { + if (e < max_samplepos) { ++e; } _editor->session()->locations()->find_all_between (s, e, ll, Location::Flags (0)); @@ -4042,25 +4455,25 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } void -MarkerDrag::setup_pointer_frame_offset () +MarkerDrag::setup_pointer_sample_offset () { bool is_start; Location *location = _editor->find_location_from_marker (_marker, is_start); - _pointer_frame_offset = raw_grab_frame() - (is_start ? location->start() : location->end()); + _pointer_sample_offset = raw_grab_sample() - (is_start ? location->start() : location->end()); } void MarkerDrag::motion (GdkEvent* event, bool) { - framecnt_t f_delta = 0; + samplecnt_t f_delta = 0; bool is_start; bool move_both = false; Location *real_location; Location *copy_location = 0; - framecnt_t const sd = snap_delta (event->button.state); + samplecnt_t const sd = snap_delta (event->button.state); - framecnt_t const newframe = adjusted_frame (_drags->current_pointer_frame () + sd, event, true) - sd; - framepos_t next = newframe; + samplecnt_t const newframe = adjusted_sample (_drags->current_pointer_sample () + sd, event, true).sample - sd; + samplepos_t next = newframe; if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::push_points_modifier ())) { move_both = true; @@ -4119,6 +4532,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) { @@ -4136,38 +4551,37 @@ 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 { - framepos_t new_start = copy_location->start() + f_delta; - framepos_t new_end = copy_location->end() + f_delta; + samplepos_t new_start = copy_location->start() + f_delta; + samplepos_t new_end = copy_location->end() + f_delta; 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); } } } @@ -4192,6 +4606,7 @@ MarkerDrag::motion (GdkEvent* event, bool) assert (!_copied_locations.empty()); show_verbose_cursor_time (newframe); + _editor->set_snapped_cursor_position(newframe); } void @@ -4244,6 +4659,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(); @@ -4262,9 +4678,9 @@ 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()) { @@ -4307,7 +4723,7 @@ MarkerDrag::aborted (bool movement_occurred) void MarkerDrag::update_item (Location*) { - /* noop */ + /* noop */ } ControlPointDrag::ControlPointDrag (Editor* e, ArdourCanvas::Item* i) @@ -4340,8 +4756,7 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) _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 (MusicSample (_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)); @@ -4394,13 +4809,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); + MusicSample 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() + _point->line().offset()); + cx_mf.sample -= snap_delta (event->button.state); + cx_mf.sample = min (cx_mf.sample, _point->line().maximum_time() + _point->line().offset()); float const fraction = 1.0 - (cy / _point->line().height()); @@ -4409,10 +4825,9 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) _editor->begin_reversible_command (_("automation event move")); _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); - - show_verbose_cursor_text (_point->line().get_verbose_cursor_string (result.second)); + pair result; + result = _point->line().drag_motion (_editor->sample_to_pixel_unrounded (cx_mf.sample), fraction, false, _pushing, _final_index); + show_verbose_cursor_text (_point->line().get_verbose_cursor_relative_string (result.first, result.second)); } void @@ -4478,16 +4893,16 @@ LineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) _line->grab_item().canvas_to_item (mx, my); - framecnt_t const frame_within_region = (framecnt_t) floor (mx * _editor->samples_per_pixel); + samplecnt_t const sample_within_region = (samplecnt_t) floor (mx * _editor->samples_per_pixel); - if (!_line->control_points_adjacent (frame_within_region, _before, _after)) { + if (!_line->control_points_adjacent (sample_within_region, _before, _after)) { /* no adjacent points */ return; } Drag::start_grab (event, _editor->cursors()->fader); - /* store grab start in item frame */ + /* store grab start in item sample */ double const bx = _line->nth (_before)->get_x(); double const ax = _line->nth (_after)->get_x(); double const click_ratio = (ax - mx) / (ax - bx); @@ -4529,10 +4944,10 @@ LineDrag::motion (GdkEvent* event, bool first_move) } /* we are ignoring x position for this drag, so we can just pass in anything */ - pair result; + pair result; result = _line->drag_motion (0, fraction, true, false, ignored); - show_verbose_cursor_text (_line->get_verbose_cursor_string (result.second)); + show_verbose_cursor_text (_line->get_verbose_cursor_relative_string (result.first, result.second)); } void @@ -4548,7 +4963,7 @@ LineDrag::finished (GdkEvent* event, bool movement_occurred) AutomationTimeAxisView* atv; if ((atv = dynamic_cast(_editor->clicked_axisview)) != 0) { - framepos_t where = grab_frame (); + samplepos_t where = grab_sample (); double cx = 0; double cy = _fixed_grab_y; @@ -4599,7 +5014,7 @@ FeatureLineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) _item->parent()->canvas_to_item (cx, cy); - /* store grab start in parent frame */ + /* store grab start in parent sample */ _region_view_grab_x = cx; _before = *(float*) _item->get_data ("position"); @@ -4663,34 +5078,33 @@ void RubberbandSelectDrag::start_grab (GdkEvent* event, Gdk::Cursor *) { Drag::start_grab (event); - show_verbose_cursor_time (adjusted_current_frame (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid())); + show_verbose_cursor_time (adjusted_current_sample (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid())); } void RubberbandSelectDrag::motion (GdkEvent* event, bool) { - framepos_t start; - framepos_t end; + samplepos_t start; + samplepos_t end; double y1; double y2; + samplepos_t const pf = adjusted_current_sample (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid()); + MusicSample grab (grab_sample (), 0); - framepos_t const pf = adjusted_current_frame (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid()); - - framepos_t grab = grab_frame (); if (UIConfiguration::instance().get_rubberbanding_snaps_to_grid ()) { - _editor->snap_to_with_modifier (grab, event); + _editor->snap_to_with_modifier (grab, event, RoundNearest, SnapToGrid_Scaled); } else { - grab = raw_grab_frame (); + grab.sample = raw_grab_sample (); } /* base start and end on initial click position */ - if (pf < grab) { + if (pf < grab.sample) { start = pf; - end = grab; + end = grab.sample; } else { end = pf; - start = grab; + start = grab.sample; } if (current_pointer_y() < grab_y()) { @@ -4749,13 +5163,13 @@ RubberbandSelectDrag::motion (GdkEvent* event, bool) void RubberbandSelectDrag::do_select_things (GdkEvent* event, bool drag_in_progress) { - framepos_t x1; - framepos_t x2; - framepos_t grab = grab_frame (); - framepos_t lpf = last_pointer_frame (); + samplepos_t x1; + samplepos_t x2; + samplepos_t grab = grab_sample (); + samplepos_t lpf = last_pointer_sample (); if (!UIConfiguration::instance().get_rubberbanding_snaps_to_grid ()) { - grab = raw_grab_frame (); + grab = raw_grab_sample (); lpf = _editor->pixel_to_sample_from_event (last_pointer_x()); } @@ -4800,7 +5214,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, _editor->get_grid_music_divisions(event->button.state)); + add_midi_region (mtv, true); do_deselect = false; } } @@ -4839,10 +5253,10 @@ TimeFXDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _editor->get_selection().add (_primary); - framepos_t where = _primary->region()->position(); + MusicSample where (_primary->region()->position(), 0); setup_snap_delta (where); - show_verbose_cursor_duration (where, adjusted_current_frame (event), 0); + show_verbose_cursor_duration (where.sample, adjusted_current_sample (event), 0); } void @@ -4850,19 +5264,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); + MusicSample 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.sample -= 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.sample > rv->region()->position()) { + rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf.sample, layers, layer); } - show_verbose_cursor_duration (_primary->region()->position(), pf, 0); + show_verbose_cursor_duration (_primary->region()->position(), pf.sample, 0); } void @@ -4881,14 +5295,14 @@ TimeFXDrag::finished (GdkEvent* event, bool movement_occurred) _primary->get_time_axis_view().hide_timestretch (); - framepos_t adjusted_frame_pos = adjusted_current_frame (event); + samplepos_t adjusted_sample_pos = adjusted_current_sample (event); - if (adjusted_frame_pos < _primary->region()->position()) { + if (adjusted_sample_pos < _primary->region()->position()) { /* backwards drag of the left edge - not usable */ return; } - framecnt_t newlen = adjusted_frame_pos - _primary->region()->position(); + samplecnt_t newlen = adjusted_sample_pos - _primary->region()->position(); fraction = (double) newlen / (double) _primary->region()->length(); @@ -4934,7 +5348,7 @@ ScrubDrag::start_grab (GdkEvent* event, Gdk::Cursor *) void ScrubDrag::motion (GdkEvent* /*event*/, bool) { - _editor->scrub (adjusted_current_frame (0, false), _drags->current_pointer_x ()); + _editor->scrub (adjusted_current_sample (0, false), _drags->current_pointer_x ()); } void @@ -4956,13 +5370,14 @@ 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"); if (_time_selection_at_start) { start_at_start = _editor->get_selection().time.start(); - end_at_start = _editor->get_selection().time.end_frame(); + end_at_start = _editor->get_selection().time.end_sample(); } } @@ -5012,25 +5427,25 @@ SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*) if (_operation == SelectionMove) { show_verbose_cursor_time (_editor->selection->time[_editor->clicked_selection].start); } else { - show_verbose_cursor_time (adjusted_current_frame (event)); + show_verbose_cursor_time (adjusted_current_sample (event)); } } void -SelectionDrag::setup_pointer_frame_offset () +SelectionDrag::setup_pointer_sample_offset () { switch (_operation) { case CreateSelection: - _pointer_frame_offset = 0; + _pointer_sample_offset = 0; break; case SelectionStartTrim: case SelectionMove: - _pointer_frame_offset = raw_grab_frame() - _editor->selection->time[_editor->clicked_selection].start; + _pointer_sample_offset = raw_grab_sample() - _editor->selection->time[_editor->clicked_selection].start; break; case SelectionEndTrim: - _pointer_frame_offset = raw_grab_frame() - _editor->selection->time[_editor->clicked_selection].end; + _pointer_sample_offset = raw_grab_sample() - _editor->selection->time[_editor->clicked_selection].end; break; case SelectionExtend: @@ -5041,37 +5456,40 @@ SelectionDrag::setup_pointer_frame_offset () void SelectionDrag::motion (GdkEvent* event, bool first_move) { - framepos_t start = 0; - framepos_t end = 0; - framecnt_t length = 0; - framecnt_t distance = 0; + samplepos_t start = 0; + samplepos_t end = 0; + samplecnt_t length = 0; + samplecnt_t distance = 0; + MusicSample start_mf (0, 0); + samplepos_t const pending_position = adjusted_current_sample (event); - framepos_t const pending_position = adjusted_current_frame (event); - - if (_operation != CreateSelection && pending_position == last_pointer_frame()) { + if (_operation != CreateSelection && pending_position == last_pointer_sample()) { return; } + if (first_move) { + _track_selection_at_start = _editor->selection->tracks; + } + switch (_operation) { case CreateSelection: { - framepos_t grab = grab_frame (); - + MusicSample grab (grab_sample (), 0); if (first_move) { - grab = adjusted_current_frame (event, false); - if (grab < pending_position) { + grab.sample = adjusted_current_sample (event, false); + if (grab.sample < pending_position) { _editor->snap_to (grab, RoundDownMaybe); } else { _editor->snap_to (grab, RoundUpMaybe); } } - if (pending_position < grab) { + if (pending_position < grab.sample) { start = pending_position; - end = grab; + end = grab.sample; } else { end = pending_position; - start = grab; + start = grab.sample; } /* first drag: Either add to the selection @@ -5123,32 +5541,59 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) } } - //now find any tracks that are GROUPED with the tracks we selected - TrackViewList grouped_add = new_selection; + //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; + vector selected_route_groups; + + 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); + } else { + RouteGroup* rg = (*i)->route_group(); + if (rg && rg->is_active() && rg->is_select()) { + selected_route_groups.push_back (rg); + } + } + } + } + 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::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()) ) - grouped_add.push_back (*j); + if (!_editor->selection->tracks.contains (*i)) { + tracks_to_add.push_back (*i); + RouteGroup* rg = (*i)->route_group(); + + if (rg && rg->is_active() && rg->is_select()) { + selected_route_groups.push_back (rg); } } } - //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); + _editor->selection->add (tracks_to_add); + + if (!tracks_to_remove.empty()) { + + /* check all these to-be-removed tracks against the + * possibility that they are selected by being + * in the same group as an approved track. + */ + + for (TrackViewList::iterator i = tracks_to_remove.begin(); i != tracks_to_remove.end(); ) { + RouteGroup* rg = (*i)->route_group(); + + if (rg && find (selected_route_groups.begin(), selected_route_groups.end(), rg) != selected_route_groups.end()) { + i = tracks_to_remove.erase (i); + } else { + ++i; + } + } + + /* remove whatever is left */ + _editor->selection->remove (tracks_to_remove); + } } } break; @@ -5184,9 +5629,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.sample = start; + _editor->snap_to (start_mf); + + end = start_mf.sample + length; break; @@ -5228,19 +5675,20 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) /* XXX what if its a music time selection? */ if (s) { - if (s->get_play_range() && s->transport_rolling()) { - 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()); + + //if Follow Edits is on, maybe try to follow the range selection ... also consider range-audition mode + if ( !s->config.get_external_sync() && s->transport_rolling() ) { + if ( s->solo_selection_active() ) { + _editor->play_solo_selection(true); //play the newly selected range, and move solos to match + } else if ( UIConfiguration::instance().get_follow_edits() && s->get_play_range() ) { //already rolling a selected range + s->request_play_range (&_editor->selection->time, true); //play the newly selected range } + } else if ( !s->transport_rolling() && UIConfiguration::instance().get_follow_edits() ) { + s->request_locate (_editor->get_selection().time.start()); } if (_editor->get_selection().time.length() != 0) { - s->set_range_selection (_editor->get_selection().time.start(), _editor->get_selection().time.end_frame()); + s->set_range_selection (_editor->get_selection().time.start(), _editor->get_selection().time.end_sample()); } else { s->clear_range_selection (); } @@ -5250,11 +5698,18 @@ 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); - framepos_t start = min (pos, start_at_start); - framepos_t end = max (pos, end_at_start); + samplepos_t pos = adjusted_current_sample (event, false); + samplepos_t start = min (pos, start_at_start); + samplepos_t end = max (pos, end_at_start); _editor->selection->set (start, end); } } else { @@ -5345,14 +5800,14 @@ RangeMarkerBarDrag::start_grab (GdkEvent* event, Gdk::Cursor *) Drag::start_grab (event, cursor); - show_verbose_cursor_time (adjusted_current_frame (event)); + show_verbose_cursor_time (adjusted_current_sample (event)); } void RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) { - framepos_t start = 0; - framepos_t end = 0; + samplepos_t start = 0; + samplepos_t end = 0; ArdourCanvas::Rectangle *crect; switch (_operation) { @@ -5374,18 +5829,18 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) break; } - framepos_t const pf = adjusted_current_frame (event); + samplepos_t const pf = adjusted_current_sample (event); if (_operation == CreateSkipMarker || _operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker) { - framepos_t grab = grab_frame (); + MusicSample grab (grab_sample (), 0); _editor->snap_to (grab); - if (pf < grab_frame()) { + if (pf < grab_sample()) { start = pf; - end = grab; + end = grab.sample; } else { end = pf; - start = grab; + start = grab.sample; } /* first drag: Either add to the selection @@ -5435,7 +5890,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) case CreateSkipMarker: case CreateRangeMarker: case CreateCDMarker: - { + { XMLNode &before = _editor->session()->locations()->get_state(); if (_operation == CreateSkipMarker) { _editor->begin_reversible_command (_("new skip marker")); @@ -5455,14 +5910,14 @@ 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(); _editor->session()->add_command(new MementoCommand(*(_editor->session()->locations()), &before, &after)); _editor->commit_reversible_command (); break; - } + } case CreateTransportMarker: // popup menu to pick loop or punch @@ -5478,7 +5933,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) /* didn't drag, so just locate */ - _editor->session()->request_locate (grab_frame(), _editor->session()->transport_rolling()); + _editor->session()->request_locate (grab_sample(), _editor->session()->transport_rolling()); } else if (_operation == CreateCDMarker) { @@ -5487,17 +5942,17 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) } else { /* operation == CreateRangeMarker || CreateSkipMarker */ - framepos_t start; - framepos_t end; + samplepos_t start; + samplepos_t end; - _editor->session()->locations()->marks_either_side (grab_frame(), start, end); + _editor->session()->locations()->marks_either_side (grab_sample(), start, end); - if (end == max_framepos) { - end = _editor->session()->current_end_frame (); + if (end == max_samplepos) { + end = _editor->session()->current_end_sample (); } - if (start == max_framepos) { - start = _editor->session()->current_start_frame (); + if (start == max_samplepos) { + start = _editor->session()->current_start_sample (); } switch (_editor->mouse_mode) { @@ -5542,7 +5997,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"); @@ -5552,11 +6009,25 @@ NoteDrag::NoteDrag (Editor* e, ArdourCanvas::Item* i) _note_height = _region->midi_stream_view()->note_height (); } +void +NoteDrag::setup_pointer_sample_offset () +{ + _pointer_sample_offset = raw_grab_sample() + - _editor->session()->tempo_map().sample_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 (MusicSample (_region->source_beats_to_absolute_samples (_primary->note()->time ()), 0)); if (!(_was_selected = _primary->selected())) { @@ -5580,55 +6051,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()); + /* dx in samples */ + sampleoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x()); /* primary note time */ - double const quarter_note_start = _region->region()->pos_beats() - _region->midi_region()->start_beats(); - 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); + sampleoffset_t const n = map.sample_at_quarter_note (_region->session_relative_qn (_primary->note()->time().to_double())); - framepos_t const rp = _region->region()->position (); + /* primary note time in quarter notes */ + double const n_qn = _region->session_relative_qn (_primary->note()->time().to_double()); - /* prevent the note being dragged earlier than the region's position */ - st = max (st, rp); + /* new time of the primary note in session samples */ + sampleoffset_t st = n + dx + snap_delta (event->button.state); - /* possibly snap and return corresponding delta */ + /* possibly snap and return corresponding delta in quarter notes */ + MusicSample snap (st, 0); + _editor->snap_to_with_modifier (snap, event, RoundNearest, SnapToGrid_Unscaled); + double ret = map.exact_qn_at_sample (snap.sample, snap.division) - n_qn - snap_delta_music (event->button.state); - bool snap = true; - - 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; } @@ -5640,36 +6094,48 @@ NoteDrag::total_dy () const return 0; } - MidiStreamView* msv = _region->midi_stream_view (); 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 = _x_constrained ? 0 : _editor->sample_to_pixel (dx) - _cumulative_dx; + 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(); if (tdx || tdy) { - _region->move_selection (tdx, tdy, note_delta); + 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 @@ -5680,6 +6146,8 @@ NoteDrag::motion (GdkEvent * event, bool) 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); + + _editor->set_snapped_cursor_position( _region->source_beats_to_absolute_samples(_primary->note()->time()) ); } } } @@ -5729,7 +6197,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); } } @@ -5788,7 +6256,7 @@ AutomationRangeDrag::setup (list > const & lin list >::const_iterator j = i; ++j; - pair r = (*i)->get_point_x_range (); + pair r = (*i)->get_point_x_range (); /* check this range against all the AudioRanges that we are using */ list::const_iterator k = _ranges.begin (); @@ -5869,7 +6337,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move) for (list::const_iterator i = _ranges.begin(); i != _ranges.end(); ++i) { - framecnt_t const half = (i->start + i->end) / 2; + samplecnt_t const half = (i->start + i->end) / 2; /* find the line that this audio range starts in */ list::iterator j = _lines.begin(); @@ -5884,7 +6352,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move) 64 samples length plucked out of thin air. */ - framepos_t a = i->start + 64; + samplepos_t a = i->start + 64; if (a > half) { a = half; } @@ -5916,7 +6384,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move) 64 samples length plucked out of thin air. */ - framepos_t b = i->end - 64; + samplepos_t b = i->end - 64; if (b < half) { b = half; } @@ -5973,10 +6441,10 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move) for (list::iterator l = _lines.begin(); l != _lines.end(); ++l) { float const f = y_fraction (l->line, current_pointer_y()); /* we are ignoring x position for this drag, so we can just pass in anything */ - pair result; + pair result; uint32_t ignored; result = l->line->drag_motion (0, f, true, false, ignored); - show_verbose_cursor_text (l->line->get_verbose_cursor_relative_string (l->original_fraction, result.second)); + show_verbose_cursor_text (l->line->get_verbose_cursor_relative_string (result.first, result.second)); } } @@ -6025,19 +6493,19 @@ PatchChangeDrag::PatchChangeDrag (Editor* e, PatchChange* i, MidiRegionView* r) , _cumulative_dx (0) { DEBUG_TRACE (DEBUG::Drags, string_compose ("New PatchChangeDrag, patch @ %1, grab @ %2\n", - _region_view->source_beats_to_absolute_frames (_patch_change->patch()->time()), - grab_frame())); + _region_view->source_beats_to_absolute_samples (_patch_change->patch()->time()), + grab_sample())); } void PatchChangeDrag::motion (GdkEvent* ev, bool) { - framepos_t f = adjusted_current_frame (ev); + samplepos_t f = adjusted_current_sample (ev); boost::shared_ptr r = _region_view->region (); f = max (f, r->position ()); - f = min (f, r->last_frame ()); + f = min (f, r->last_sample ()); - framecnt_t const dxf = f - grab_frame(); // permitted dx in frames + samplecnt_t const dxf = f - grab_sample(); // permitted dx in samples double const dxu = _editor->sample_to_pixel (dxf); // permitted fx in units _patch_change->move (ArdourCanvas::Duple (dxu - _cumulative_dx, 0)); _cumulative_dx = dxu; @@ -6054,13 +6522,13 @@ PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred) } boost::shared_ptr r (_region_view->region ()); - framepos_t f = adjusted_current_frame (ev); + samplepos_t f = adjusted_current_sample (ev); f = max (f, r->position ()); - f = min (f, r->last_frame ()); + f = min (f, r->last_sample ()); _region_view->move_patch_change ( *_patch_change, - _region_view->region_frames_to_region_beats (f - (r->position() - r->start())) + _region_view->region_samples_to_region_beats (f - (r->position() - r->start())) ); } @@ -6071,10 +6539,10 @@ PatchChangeDrag::aborted (bool) } void -PatchChangeDrag::setup_pointer_frame_offset () +PatchChangeDrag::setup_pointer_sample_offset () { boost::shared_ptr region = _region_view->region (); - _pointer_frame_offset = raw_grab_frame() - _region_view->source_beats_to_absolute_frames (_patch_change->patch()->time()); + _pointer_sample_offset = raw_grab_sample() - _region_view->source_beats_to_absolute_samples (_patch_change->patch()->time()); } MidiRubberbandSelectDrag::MidiRubberbandSelectDrag (Editor* e, MidiRegionView* rv) @@ -6085,7 +6553,7 @@ MidiRubberbandSelectDrag::MidiRubberbandSelectDrag (Editor* e, MidiRegionView* r } void -MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool /*drag_in_progress*/) +MidiRubberbandSelectDrag::select_things (int button_state, samplepos_t x1, samplepos_t x2, double y1, double y2, bool /*drag_in_progress*/) { _region_view->update_drag_selection ( x1, x2, y1, y2, @@ -6106,7 +6574,7 @@ MidiVerticalSelectDrag::MidiVerticalSelectDrag (Editor* e, MidiRegionView* rv) } void -MidiVerticalSelectDrag::select_things (int button_state, framepos_t /*x1*/, framepos_t /*x2*/, double y1, double y2, bool /*drag_in_progress*/) +MidiVerticalSelectDrag::select_things (int button_state, samplepos_t /*x1*/, samplepos_t /*x2*/, double y1, double y2, bool /*drag_in_progress*/) { double const y = _region_view->midi_view()->y_position (); @@ -6133,7 +6601,7 @@ EditorRubberbandSelectDrag::EditorRubberbandSelectDrag (Editor* e, ArdourCanvas: } void -EditorRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) +EditorRubberbandSelectDrag::select_things (int button_state, samplepos_t x1, samplepos_t x2, double y1, double y2, bool drag_in_progress) { if (drag_in_progress) { /* We just want to select things at the end of the drag, not during it */ @@ -6176,16 +6644,15 @@ NoteCreateDrag::~NoteCreateDrag () delete _drag_rect; } -framecnt_t -NoteCreateDrag::grid_frames (framepos_t t) const +samplecnt_t +NoteCreateDrag::grid_samples (samplepos_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 Temporal::Beats grid_beats = _region_view->get_grid_beats (t); + const Temporal::Beats t_beats = _region_view->region_samples_to_region_beats (t); + + return _region_view->region_beats_to_region_samples (t_beats + grid_beats) + - _region_view->region_beats_to_region_samples (t_beats); } void @@ -6196,19 +6663,16 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _drag_rect = new ArdourCanvas::Rectangle (_region_view->get_canvas_group ()); TempoMap& map (_editor->session()->tempo_map()); - const framepos_t pf = _drags->current_pointer_frame (); + const samplepos_t pf = _drags->current_pointer_sample (); const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); - double eqaf = map.exact_qn_at_frame (pf, divisions); + const Temporal::Beats grid_beats = _region_view->get_grid_beats (pf); + + double eqaf = map.exact_qn_at_sample (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); + const double qaf = map.quarter_note_at_sample (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. @@ -6220,14 +6684,15 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } } - _note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); - _note[1] = _note[0]; + _note[0] = map.sample_at_quarter_note (eqaf) - _region_view->region()->position(); + /* minimum initial length is grid beats */ + _note[1] = map.sample_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); @@ -6237,18 +6702,15 @@ void NoteCreateDrag::motion (GdkEvent* event, bool) { TempoMap& map (_editor->session()->tempo_map()); - const framepos_t pf = _drags->current_pointer_frame (); + const samplepos_t pf = _drags->current_pointer_sample (); const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); - double eqaf = map.exact_qn_at_frame (pf, divisions); + double eqaf = map.exact_qn_at_sample (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); + const Temporal::Beats grid_beats = _region_view->get_grid_beats (pf); + + const double qaf = map.quarter_note_at_sample (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. */ @@ -6260,7 +6722,7 @@ NoteCreateDrag::motion (GdkEvent* event, bool) eqaf += grid_beats.to_double(); } - _note[1] = max ((framepos_t)0, map.frame_at_quarter_note (eqaf) - _region_view->region()->position ()); + _note[1] = max ((samplepos_t)0, map.sample_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]); @@ -6271,26 +6733,24 @@ NoteCreateDrag::motion (GdkEvent* event, bool) void 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); + /* we create a note even if there was no movement */ + samplepos_t const start = min (_note[0], _note[1]); + samplepos_t const start_sess_rel = start + _region_view->region()->position(); + samplecnt_t length = max (_editor->pixel_to_sample (1.0), (samplecnt_t) fabs ((double)(_note[0] - _note[1]))); + samplecnt_t const g = grid_samples (start_sess_rel); if (_editor->get_grid_music_divisions (ev->button.state) != 0 && length < g) { length = g; } 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); + const double qn_length = map.quarter_notes_between_samples (start_sess_rel, start_sess_rel + length); + Temporal::Beats qn_length_beats = max (Temporal::Beats::ticks(1), Temporal::Beats (qn_length)); - Evoral::Beats qn_length_beats = max (one_tick, Evoral::Beats (qn_length)); + _editor->begin_reversible_command (_("Create Note")); + _region_view->clear_editor_note_selection(); _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false); + _editor->commit_reversible_command (); } double @@ -6307,6 +6767,101 @@ NoteCreateDrag::aborted (bool) } +HitCreateDrag::HitCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv) + : Drag (e, i) + , _region_view (rv) + , _last_pos (0) + , _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()); + + _y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); + + const samplepos_t pf = _drags->current_pointer_sample (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + const double eqaf = map.exact_qn_at_sample (pf, divisions); + + boost::shared_ptr mr = _region_view->midi_region(); + + if (eqaf >= mr->quarter_note() + mr->length_beats()) { + return; + } + + const samplepos_t start = map.sample_at_quarter_note (eqaf) - _region_view->region()->position(); + Temporal::Beats length = _region_view->get_grid_beats (pf); + + _editor->begin_reversible_command (_("Create Hit")); + _region_view->clear_editor_note_selection(); + _region_view->create_note_at (start, _y, length, event->button.state, false); + + _last_pos = start; +} + +void +HitCreateDrag::motion (GdkEvent* event, bool) +{ + TempoMap& map (_editor->session()->tempo_map()); + + const samplepos_t pf = _drags->current_pointer_sample (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + if (divisions == 0) { + return; + } + + const double eqaf = map.exact_qn_at_sample (pf, divisions); + const samplepos_t start = map.sample_at_quarter_note (eqaf) - _region_view->region()->position (); + + if (_last_pos == start) { + return; + } + + Temporal::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; +} + +void +HitCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */) +{ + _editor->commit_reversible_command (); + +} + +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) @@ -6326,7 +6881,7 @@ CrossfadeEdgeDrag::motion (GdkEvent*, bool) { double distance; double new_length; - framecnt_t len; + samplecnt_t len; boost::shared_ptr ar (arv->audio_region()); @@ -6358,7 +6913,7 @@ CrossfadeEdgeDrag::finished (GdkEvent*, bool) { double distance; double new_length; - framecnt_t len; + samplecnt_t len; boost::shared_ptr ar (arv->audio_region()); @@ -6403,26 +6958,25 @@ CrossfadeEdgeDrag::aborted (bool) } } -RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, framepos_t pos) +RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, samplepos_t pos) : Drag (e, item, true) - , line (new EditorCursor (*e)) { - line->set_position (pos); - line->show (); } RegionCutDrag::~RegionCutDrag () { - delete line; } 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) +{ } void @@ -6430,17 +6984,17 @@ RegionCutDrag::finished (GdkEvent* event, bool) { _editor->get_track_canvas()->canvas()->re_enter(); - framepos_t pos = _drags->current_pointer_frame(); - line->hide (); + MusicSample pos (_drags->current_pointer_sample(), 0); + _editor->snap_to_with_modifier (pos, event); - RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos); + RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos.sample); if (rs.empty()) { return; } - _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state)); + _editor->split_regions_at (pos, rs); } void