X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=ac761dcb6cb13190ab9971d4933298677a961e2a;hb=d38dc863800642ae57711a8e446a0fca5d5a3d32;hp=4a3bd049b205a9494b6ee17be7698a9c42a01b6c;hpb=d2d2308588e8444b0e2847b9eff03ed5e553e0f6;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 4a3bd049b2..ac761dcb6c 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -37,6 +37,7 @@ #include "ardour/midi_region.h" #include "ardour/midi_track.h" #include "ardour/operations.h" +#include "ardour/profile.h" #include "ardour/region_factory.h" #include "ardour/session.h" @@ -267,7 +268,7 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor) _raw_grab_frame = _editor->canvas_event_sample (event, &_grab_x, &_grab_y); setup_pointer_frame_offset (); - _grab_frame = adjusted_frame (_raw_grab_frame, event); + _grab_frame = adjusted_frame (_raw_grab_frame, event).frame; _last_pointer_frame = _grab_frame; _last_pointer_x = _grab_x; @@ -323,13 +324,13 @@ Drag::end_grab (GdkEvent* event) return _move_threshold_passed; } -framepos_t +MusicFrame Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const { - framepos_t pos = 0; + MusicFrame pos (0, 0); if (f > _pointer_frame_offset) { - pos = f - _pointer_frame_offset; + pos.frame = f - _pointer_frame_offset; } if (snap) { @@ -342,7 +343,7 @@ Drag::adjusted_frame (framepos_t f, GdkEvent const * event, bool snap) const framepos_t Drag::adjusted_current_frame (GdkEvent const * event, bool snap) const { - return adjusted_frame (_drags->current_pointer_frame (), event, snap); + return adjusted_frame (_drags->current_pointer_frame (), event, snap).frame; } frameoffset_t @@ -374,9 +375,9 @@ Drag::current_pointer_y () const void Drag::setup_snap_delta (framepos_t pos) { - framepos_t temp = pos; - _editor->snap_to (temp, ARDOUR::RoundNearest, false, true); - _snap_delta = temp - pos; + MusicFrame snap (pos, 0); + _editor->snap_to (snap, ARDOUR::RoundNearest, false, true); + _snap_delta = snap.frame - pos; } bool @@ -512,7 +513,7 @@ 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()); @@ -521,7 +522,7 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_nu 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); + return view->add_region (grab_frame(), len, commit); } return boost::shared_ptr(); @@ -602,6 +603,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 +618,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.frame); - show_verbose_cursor_time (_last_frame_position); + show_verbose_cursor_time (_last_position.frame); pair const tv = _editor->trackview_by_y_position (current_pointer_y ()); if (tv.first) { @@ -638,14 +640,13 @@ RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } double -RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_region_position) +RegionMotionDrag::compute_x_delta (GdkEvent const * event, MusicFrame* pending_region_position) { /* compute the amount of pointer motion in frames, and where the region would be if we moved it by that much. */ *pending_region_position = adjusted_frame (_drags->current_pointer_frame (), event, false); - framepos_t sync_frame; framecnt_t sync_offset; int32_t sync_dir; @@ -653,47 +654,44 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r /* we don't handle a sync point that lies before zero. */ - if (sync_dir >= 0 || (sync_dir < 0 && *pending_region_position >= sync_offset)) { + if (sync_dir >= 0 || (sync_dir < 0 && pending_region_position->frame >= sync_offset)) { framecnt_t const sd = snap_delta (event->button.state); - sync_frame = *pending_region_position + (sync_dir * sync_offset) + sd; - - _editor->snap_to_with_modifier (sync_frame, event); - - *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - sd; - + MusicFrame sync_snap (pending_region_position->frame + (sync_dir * sync_offset) + sd, 0); + _editor->snap_to_with_modifier (sync_snap, event); + if (sync_offset == 0 && sd == 0) { + *pending_region_position = sync_snap; + } else { + pending_region_position->set (_primary->region()->adjust_to_sync (sync_snap.frame) - sd, 0); + } } else { - *pending_region_position = _last_frame_position; + *pending_region_position = _last_position; } - if (*pending_region_position > max_framepos - _primary->region()->length()) { - *pending_region_position = _last_frame_position; + if (pending_region_position->frame > max_framepos - _primary->region()->length()) { + *pending_region_position = _last_position; } double dx = 0; bool const x_move_allowed = !_x_constrained; - if ((*pending_region_position != _last_frame_position) && x_move_allowed) { + if ((pending_region_position->frame != _last_position.frame) && x_move_allowed) { /* x movement since last time (in pixels) */ - dx = (static_cast (*pending_region_position) - _last_frame_position) / _editor->samples_per_pixel; + dx = _editor->sample_to_pixel_unrounded (pending_region_position->frame - _last_position.frame); /* total x movement */ - framecnt_t total_dx = *pending_region_position; - if (regions_came_from_canvas()) { - total_dx = total_dx - grab_frame (); - } + framecnt_t total_dx = _editor->pixel_to_sample (_total_x_delta + dx); - /* check that no regions have gone off the start of the session */ for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - if ((i->view->region()->position() + total_dx) < 0) { - dx = 0; - *pending_region_position = _last_frame_position; + frameoffset_t const off = i->view->region()->position() + total_dx; + if (off < 0) { + dx = dx - _editor->sample_to_pixel_unrounded (off); + *pending_region_position = MusicFrame (pending_region_position->frame - off, 0); break; } } - } return dx; @@ -930,9 +928,9 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) } /* Work out the change in x */ - framepos_t pending_region_position; + MusicFrame pending_region_position (0, 0); double const x_delta = compute_x_delta (event, &pending_region_position); - _last_frame_position = pending_region_position; + _last_position = pending_region_position; /* calculate hidden tracks in current y-axis delta */ int delta_skip = 0; @@ -1099,6 +1097,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 +1133,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) i->layer += this_delta_layer; if (_brushing) { - _editor->mouse_brush_insert_region (rv, pending_region_position); + _editor->mouse_brush_insert_region (rv, pending_region_position.frame); } else { Duple track_origin; @@ -1160,6 +1162,14 @@ 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 */ @@ -1170,7 +1180,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) _total_x_delta += x_delta; if (x_delta != 0 && !_brushing) { - show_verbose_cursor_time (_last_frame_position); + show_verbose_cursor_time (_last_position.frame); } /* keep track of pointer movement */ @@ -1258,8 +1268,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 +1352,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 +1368,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.frame != _primary->region()->position()); bool const changed_tracks = (_time_axis_views[_views.front().time_axis_view] != &_views.front().view->get_time_axis_view()); - framecnt_t const drag_delta = _primary->region()->position() - _last_frame_position; if (_copy) { finished_copy ( changed_position, changed_tracks, - drag_delta, + _last_position, ev->button.state ); @@ -1375,13 +1385,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 +1398,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 +1407,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->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->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*/, MusicFrame last_position, int32_t const ev_state) { RegionSelection new_views; PlaylistSet modified_playlists; RouteTimeAxisView* new_time_axis_view = 0; + framecnt_t const drag_delta = _primary->region()->position() - _last_position.frame; + + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_frame (last_position.frame, last_position.division); + const double qn_delta = _primary->region()->quarter_note() - last_pos_qn; if (_brushing) { /* all changes were made during motion event handlers */ @@ -1452,12 +1464,16 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed continue; } - framepos_t where; + MusicFrame where (0, 0); + double quarter_note; if (changed_position && !_x_constrained) { - where = i->view->region()->position() - drag_delta; + where.set (i->view->region()->position() - drag_delta, 0); + quarter_note = i->view->region()->quarter_note() - qn_delta; } else { - where = i->view->region()->position(); + /* region has not moved - divisor will not affect musical pos */ + where.set (i->view->region()->position(), 0); + quarter_note = i->view->region()->quarter_note(); } if (i->time_axis_view < 0 || i->time_axis_view >= (int)_time_axis_views.size()) { @@ -1468,6 +1484,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 +1500,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 +1547,7 @@ void RegionMoveDrag::finished_no_copy ( bool const changed_position, bool const changed_tracks, - framecnt_t const drag_delta, + MusicFrame last_position, int32_t const ev_state ) { @@ -1525,10 +1556,15 @@ RegionMoveDrag::finished_no_copy ( PlaylistSet frozen_playlists; set views_to_update; RouteTimeAxisView* new_time_axis_view = 0; + framecnt_t const drag_delta = _primary->region()->position() - _last_position.frame; typedef map, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; + TempoMap& tmap (_editor->session()->tempo_map()); + const double last_pos_qn = tmap.exact_qn_at_frame (last_position.frame, last_position.division); + const double qn_delta = _primary->region()->quarter_note() - last_pos_qn; + std::set > uniq; for (list::const_iterator i = _views.begin(); i != _views.end(); ) { @@ -1555,6 +1591,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 +1613,40 @@ RegionMoveDrag::finished_no_copy ( views_to_update.insert (dest_rtv); - framepos_t where; + MusicFrame where (0, 0); + double quarter_note; if (changed_position && !_x_constrained) { - where = rv->region()->position() - drag_delta; + where.set (rv->region()->position() - drag_delta, 0); + quarter_note = i->view->region()->quarter_note() - qn_delta; } else { - where = rv->region()->position(); + where.set (rv->region()->position(), 0); + quarter_note = i->view->region()->quarter_note(); } if (changed_tracks) { /* insert into new playlist */ + RegionView* new_view; + if (rv == _primary) { + new_view = insert_region_into_playlist ( + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, last_position, last_pos_qn, + modified_playlists, true + ); + } else { + if (rv->region()->position_lock_style() == AudioTime) { - RegionView* new_view = insert_region_into_playlist ( - RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, - modified_playlists, _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 +1704,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.frame, last_position.division); + } else { + if (rv->region()->position_lock_style() == AudioTime) { + /* move by frame offset */ + rv->region()->set_position (where.frame, 0); + } else { + /* move by music offset */ + rv->region()->set_position_music (rv->region()->quarter_note() - qn_delta); + } + } _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } @@ -1747,11 +1814,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, + MusicFrame where, + double quarter_note, + PlaylistSet& modified_playlists, + bool for_music ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); @@ -1768,7 +1836,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.frame, 1.0, false, where.division, quarter_note, true); + } else { + dest_playlist->add_region (region, where.frame, 1.0, false, where.division); + } if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { dest_playlist->set_layer (region, dest_layer); @@ -1863,13 +1935,13 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, speed = rtv->track()->speed (); } - _last_frame_position = static_cast (_primary->region()->position() / speed); + _last_position = MusicFrame (static_cast (_primary->region()->position() / speed), 0); } void RegionMoveDrag::setup_pointer_frame_offset () { - _pointer_frame_offset = raw_grab_frame() - _last_frame_position; + _pointer_frame_offset = raw_grab_frame() - _last_position.frame; } RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, RouteTimeAxisView* v, framepos_t pos) @@ -1886,7 +1958,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 = MusicFrame (pos, 0); _item = _primary->get_canvas_group (); } @@ -1906,11 +1978,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.frame, 1.0, false, _last_position.division); // Mixbus doesn't seem to ripple when inserting regions from the list: should we? yes, probably if (Config->get_edit_mode() == Ripple) { - playlist->ripple (_last_frame_position, _primary->region()->length(), _primary->region()); + playlist->ripple (_last_position.frame, _primary->region()->length(), _primary->region()); } _editor->session()->add_command (new StatefulDiffCommand (playlist)); @@ -2187,7 +2261,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) framepos_t where = adjusted_current_frame (event); assert (where >= 0); - framepos_t after; + MusicFrame after (0, 0); double delta = compute_x_delta (event, &after); framecnt_t amount = _editor->pixel_to_sample (delta); @@ -2237,7 +2311,7 @@ RegionRippleDrag::motion (GdkEvent* event, bool first_move) prev_amount += amount; } - _last_frame_position = after; + _last_position = after; } void @@ -2249,8 +2323,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; @@ -2319,7 +2392,7 @@ 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) { @@ -2345,7 +2418,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(); @@ -2840,8 +2913,8 @@ TrimDrag::motion (GdkEvent* event, bool first_move) if (tv && tv->is_track()) { speed = tv->track()->speed(); } - framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, true); - framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event->button.state); + MusicFrame adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, true); + framecnt_t dt = adj_frame.frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event->button.state); if (first_move) { @@ -2922,21 +2995,11 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } } - int32_t divisions = _editor->get_grid_music_divisions (event->button.state); - - if (_editor->snap_mode() == Editing::SnapMagnetic) { - const framepos_t presnap = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, false); - - if (presnap == adj_frame) { - divisions = 0; - } - } - 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 - , divisions); + , adj_frame.division); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); @@ -2955,7 +3018,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) case EndTrim: for (list::iterator i = _views.begin(); i != _views.end(); ++i) { - bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, divisions); + bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, adj_frame.division); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -3040,18 +3103,6 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } } - if (!_views.empty()) { - if (_operation == StartTrim) { - _editor->maybe_locate_with_edit_preroll( - _views.begin()->view->region()->position()); - } - if (_operation == EndTrim) { - _editor->maybe_locate_with_edit_preroll( - _views.begin()->view->region()->position() + - _views.begin()->view->region()->length()); - } - } - if (!_editor->selection->selected (_primary)) { _primary->thaw_after_trim (); } else { @@ -3086,7 +3137,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } else { /* no mouse movement */ - if (adjusted_current_frame (event) != adjusted_frame (_drags->current_pointer_frame(), event, false)) { + if (adjusted_current_frame (event) != adjusted_frame (_drags->current_pointer_frame(), event, false).frame) { _editor->point_trim (event, adjusted_current_frame (event)); } } @@ -3206,8 +3257,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) --bbt.bars; } const double beat = map.beat_at_bbt (bbt); + const framepos_t frame = map.frame_at_beat (beat); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) - , beat, bbt, _real_section->position_lock_style()); + , beat, bbt, frame, _real_section->position_lock_style()); if (!_real_section) { aborted (true); return; @@ -3228,7 +3280,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) pf = adjusted_current_frame (event, false); } - _editor->session()->tempo_map().gui_move_meter (_real_section, pf); + _editor->session()->tempo_map().gui_set_meter_position (_real_section, pf); /* fake marker meeds to stay under the mouse, unlike the real one. */ _marker->set_position (adjusted_current_frame (event, false)); @@ -3287,7 +3339,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) _marker = reinterpret_cast (_item->get_data ("marker")); _real_section = &_marker->tempo(); - _movable = _real_section->movable(); + _movable = !_real_section->initial(); _grab_bpm = _real_section->note_types_per_minute(); assert (_marker); } @@ -3391,7 +3443,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) /* 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()); } @@ -3490,7 +3542,7 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move) if (first_move) { /* get current state */ before_state = &map.get_state(); - _editor->begin_reversible_command (_("dilate tempo")); + _editor->begin_reversible_command (_("stretch tempo")); } framepos_t pf; @@ -3503,7 +3555,7 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move) 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); + _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf); } ostringstream sstr; sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).note_types_per_minute() << "\n"; @@ -3577,14 +3629,13 @@ void CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) { Drag::start_grab (event, c); - setup_snap_delta (_editor->playhead_cursor->current_frame ()); + setup_snap_delta (_editor->playhead_cursor->current_frame()); _grab_zoom = _editor->samples_per_pixel; - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame where (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); _editor->snap_to_with_modifier (where, event); - _editor->_dragging_playhead = true; Session* s = _editor->session (); @@ -3619,16 +3670,18 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) } } - fake_locate (where - snap_delta (event->button.state)); + fake_locate (where.frame - snap_delta (event->button.state)); } void CursorDrag::motion (GdkEvent* event, bool) { - framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame where (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (where, event); - if (where != last_pointer_frame()) { - fake_locate (where - snap_delta (event->button.state)); + + if (where.frame != last_pointer_frame()) { + fake_locate (where.frame - snap_delta (event->button.state)); } } @@ -3663,7 +3716,7 @@ CursorDrag::aborted (bool) _editor->_dragging_playhead = false; } - _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false)); + _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false).frame); } FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) @@ -3679,7 +3732,7 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr const r = arv->audio_region (); - setup_snap_delta (r->position ()); + setup_snap_delta (r->position()); show_verbose_cursor_duration (r->position(), r->position() + r->fade_in()->back()->when, 32); } @@ -3697,18 +3750,19 @@ FadeInDrag::motion (GdkEvent* event, bool) { framecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.frame < (region->position() + 64)) { fade_length = 64; // this should be a minimum defined somewhere - } else if (pos > region->position() + region->length() - region->fade_out()->back()->when) { + } else if (pos.frame > region->position() + region->length() - region->fade_out()->back()->when) { fade_length = region->length() - region->fade_out()->back()->when - 1; } else { - fade_length = pos - region->position(); + fade_length = pos.frame - region->position(); } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3733,18 +3787,19 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred) } framecnt_t fade_length; - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos < (region->position() + 64)) { + if (pos.frame < (region->position() + 64)) { fade_length = 64; // this should be a minimum defined somewhere - } else if (pos >= region->position() + region->length() - region->fade_out()->back()->when) { + } else if (pos.frame >= region->position() + region->length() - region->fade_out()->back()->when) { fade_length = region->length() - region->fade_out()->back()->when - 1; } else { - fade_length = pos - region->position(); + fade_length = pos.frame - region->position(); } bool in_command = false; @@ -3803,7 +3858,7 @@ FadeOutDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr r = arv->audio_region (); - setup_snap_delta (r->last_frame ()); + setup_snap_delta (r->last_frame()); show_verbose_cursor_duration (r->last_frame() - r->fade_out()->back()->when, r->last_frame()); } @@ -3820,19 +3875,19 @@ void FadeOutDrag::motion (GdkEvent* event, bool) { framecnt_t fade_length; + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.frame > (region->last_frame() - 64)) { fade_length = 64; // this should really be a minimum fade defined somewhere - } else if (pos <= region->position() + region->fade_in()->back()->when) { + } else if (pos.frame <= region->position() + region->fade_in()->back()->when) { fade_length = region->length() - region->fade_in()->back()->when - 1; } else { - fade_length = region->last_frame() - pos; + fade_length = region->last_frame() - pos.frame; } for (list::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3857,19 +3912,19 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred) } framecnt_t fade_length; + MusicFrame pos (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); - framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event->button.state); _editor->snap_to_with_modifier (pos, event); - pos -= snap_delta (event->button.state); + pos.frame -= snap_delta (event->button.state); boost::shared_ptr region = boost::dynamic_pointer_cast (_primary->region ()); - if (pos > (region->last_frame() - 64)) { + if (pos.frame > (region->last_frame() - 64)) { fade_length = 64; // this should really be a minimum fade defined somewhere - } else if (pos <= region->position() + region->fade_in()->back()->when) { + } else if (pos.frame <= region->position() + region->fade_in()->back()->when) { fade_length = region->length() - region->fade_in()->back()->when - 1; } else { - fade_length = region->last_frame() - pos; + fade_length = region->last_frame() - pos.frame; } bool in_command = false; @@ -4068,7 +4123,7 @@ MarkerDrag::motion (GdkEvent* event, bool) Location *copy_location = 0; framecnt_t const sd = snap_delta (event->button.state); - framecnt_t const newframe = adjusted_frame (_drags->current_pointer_frame () + sd, event, true) - sd; + framecnt_t const newframe = adjusted_frame (_drags->current_pointer_frame () + sd, event, true).frame - sd; framepos_t next = newframe; if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::push_points_modifier ())) { @@ -4128,6 +4183,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) { @@ -4145,8 +4202,7 @@ MarkerDrag::motion (GdkEvent* event, bool) if (copy_location->is_mark()) { /* now move it */ - - copy_location->set_start (copy_location->start() + f_delta); + copy_location->set_start (copy_location->start() + f_delta, false, true, divisions); } else { @@ -4156,27 +4212,27 @@ MarkerDrag::motion (GdkEvent* event, bool) if (is_start) { // start-of-range marker if (move_both || (*x).move_both) { - copy_location->set_start (new_start); - copy_location->set_end (new_end); + copy_location->set_start (new_start, false, true, divisions); + copy_location->set_end (new_end, false, true, divisions); } else if (new_start < copy_location->end()) { - copy_location->set_start (new_start); + copy_location->set_start (new_start, false, true, divisions); } else if (newframe > 0) { //_editor->snap_to (next, RoundUpAlways, true); - copy_location->set_end (next); - copy_location->set_start (newframe); + copy_location->set_end (next, false, true, divisions); + copy_location->set_start (newframe, false, true, divisions); } } else { // end marker if (move_both || (*x).move_both) { - copy_location->set_end (new_end); - copy_location->set_start (new_start); + copy_location->set_end (new_end, divisions); + copy_location->set_start (new_start, false, true, divisions); } else if (new_end > copy_location->start()) { - copy_location->set_end (new_end); + copy_location->set_end (new_end, false, true, divisions); } else if (newframe > 0) { //_editor->snap_to (next, RoundDownAlways, true); - copy_location->set_start (next); - copy_location->set_end (newframe); + copy_location->set_start (next, false, true, divisions); + copy_location->set_end (newframe, false, true, divisions); } } } @@ -4253,6 +4309,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(); @@ -4271,9 +4328,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()) { @@ -4349,8 +4406,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 (_editor->pixel_to_sample (_fixed_grab_x)); float const fraction = 1 - (_point->get_y() / _point->line().height()); show_verbose_cursor_text (_point->line().get_verbose_cursor_string (fraction)); @@ -4403,13 +4459,14 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) cy = zero_gain_y; } - framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta (event->button.state); + MusicFrame cx_mf (_editor->pixel_to_sample (cx) + snap_delta (event->button.state), 0); + if (!_x_constrained && need_snap) { - _editor->snap_to_with_modifier (cx_frames, event); + _editor->snap_to_with_modifier (cx_mf, event); } - cx_frames -= snap_delta (event->button.state); - cx_frames = min (cx_frames, _point->line().maximum_time() + _point->line().offset()); + cx_mf.frame -= snap_delta (event->button.state); + cx_mf.frame = min (cx_mf.frame, _point->line().maximum_time() + _point->line().offset()); float const fraction = 1.0 - (cy / _point->line().height()); @@ -4419,7 +4476,7 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) _point->line().start_drag_single (_point, _fixed_grab_x, initial_fraction); } pair result; - result = _point->line().drag_motion (_editor->sample_to_pixel_unrounded (cx_frames), fraction, false, _pushing, _final_index); + result = _point->line().drag_motion (_editor->sample_to_pixel_unrounded (cx_mf.frame), fraction, false, _pushing, _final_index); show_verbose_cursor_text (_point->line().get_verbose_cursor_string (result.second)); } @@ -4682,24 +4739,23 @@ RubberbandSelectDrag::motion (GdkEvent* event, bool) framepos_t end; double y1; double y2; - framepos_t const pf = adjusted_current_frame (event, UIConfiguration::instance().get_rubberbanding_snaps_to_grid()); + MusicFrame grab (grab_frame (), 0); - framepos_t grab = grab_frame (); if (UIConfiguration::instance().get_rubberbanding_snaps_to_grid ()) { _editor->snap_to_with_modifier (grab, event); } else { - grab = raw_grab_frame (); + grab.frame = raw_grab_frame (); } /* base start and end on initial click position */ - if (pf < grab) { + if (pf < grab.frame) { start = pf; - end = grab; + end = grab.frame; } else { end = pf; - start = grab; + start = grab.frame; } if (current_pointer_y() < grab_y()) { @@ -4809,7 +4865,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; } } @@ -4859,19 +4915,19 @@ TimeFXDrag::motion (GdkEvent* event, bool) { RegionView* rv = _primary; StreamView* cv = rv->get_time_axis_view().view (); - pair const tv = _editor->trackview_by_y_position (grab_y()); int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers(); - framepos_t pf = _editor->canvas_event_sample (event) + snap_delta (event->button.state); + MusicFrame pf (_editor->canvas_event_sample (event) + snap_delta (event->button.state), 0); + _editor->snap_to_with_modifier (pf, event); - pf -= snap_delta (event->button.state); + pf.frame -= snap_delta (event->button.state); - if (pf > rv->region()->position()) { - rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf, layers, layer); + if (pf.frame > rv->region()->position()) { + rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf.frame, layers, layer); } - show_verbose_cursor_duration (_primary->region()->position(), pf, 0); + show_verbose_cursor_duration (_primary->region()->position(), pf.frame, 0); } void @@ -4965,6 +5021,7 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o) : Drag (e, i) , _operation (o) , _add (false) + , _track_selection_at_start (e) , _time_selection_at_start (!_editor->get_selection().time.empty()) { DEBUG_TRACE (DEBUG::Drags, "New SelectionDrag\n"); @@ -5054,33 +5111,36 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) framepos_t end = 0; framecnt_t length = 0; framecnt_t distance = 0; - + MusicFrame start_mf (0, 0); framepos_t const pending_position = adjusted_current_frame (event); if (_operation != CreateSelection && pending_position == last_pointer_frame()) { return; } + if (first_move) { + _track_selection_at_start = _editor->selection->tracks; + } + switch (_operation) { case CreateSelection: { - framepos_t grab = grab_frame (); - + MusicFrame grab (grab_frame (), 0); if (first_move) { - grab = adjusted_current_frame (event, false); - if (grab < pending_position) { + grab.frame = adjusted_current_frame (event, false); + if (grab.frame < pending_position) { _editor->snap_to (grab, RoundDownMaybe); } else { _editor->snap_to (grab, RoundUpMaybe); } } - if (pending_position < grab) { + if (pending_position < grab.frame) { start = pending_position; - end = grab; + end = grab.frame; } else { end = pending_position; - start = grab; + start = grab.frame; } /* first drag: Either add to the selection @@ -5132,32 +5192,30 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) } } - //now find any tracks that are GROUPED with the tracks we selected - TrackViewList grouped_add = new_selection; - for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) { - RouteTimeAxisView *n = dynamic_cast(*i); - if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::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); + //now compare our list with the current selection, and add as necessary + //( NOTE: most mouse moves don't change the selection so we can't just SET it for every mouse move; it gets clunky ) + TrackViewList tracks_to_add; + TrackViewList tracks_to_remove; + + if (!first_move) { + for (TrackViewList::const_iterator i = _editor->selection->tracks.begin(); i != _editor->selection->tracks.end(); ++i) { + if (!new_selection.contains (*i) && !_track_selection_at_start.contains (*i)) { + tracks_to_remove.push_back (*i); } } } - //now compare our list with the current selection, and add or remove as necessary - //( NOTE: most mouse moves don't change the selection so we can't just SET it for every mouse move; it gets clunky ) - TrackViewList tracks_to_add; - TrackViewList tracks_to_remove; - for (TrackViewList::const_iterator i = grouped_add.begin(); i != grouped_add.end(); ++i) - if ( !_editor->selection->tracks.contains ( *i ) ) - tracks_to_add.push_back ( *i ); - for (TrackViewList::const_iterator i = _editor->selection->tracks.begin(); i != _editor->selection->tracks.end(); ++i) - if ( !grouped_add.contains ( *i ) ) - tracks_to_remove.push_back ( *i ); - _editor->selection->add(tracks_to_add); - _editor->selection->remove(tracks_to_remove); + for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) { + if (!_editor->selection->tracks.contains (*i)) { + tracks_to_add.push_back (*i); + } + } + + _editor->selection->add (tracks_to_add); + if (!tracks_to_remove.empty()) { + _editor->selection->remove (tracks_to_remove); + } } } break; @@ -5193,9 +5251,11 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) length = end - start; distance = pending_position - start; start = pending_position; - _editor->snap_to (start); - end = start + length; + start_mf.frame = start; + _editor->snap_to (start_mf); + + end = start_mf.frame + length; break; @@ -5241,10 +5301,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) s->request_play_range (&_editor->selection->time, true); } else if (!s->config.get_external_sync()) { if (UIConfiguration::instance().get_follow_edits() && !s->transport_rolling()) { - if (_operation == SelectionEndTrim) - _editor->maybe_locate_with_edit_preroll( _editor->get_selection().time.end_frame()); - else - s->request_locate (_editor->get_selection().time.start()); + s->request_locate (_editor->get_selection().time.start()); } } @@ -5259,6 +5316,13 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) /* just a click, no pointer movement. */ + if (was_double_click()) { + if (UIConfiguration::instance().get_use_double_click_to_zoom_to_selection()) { + _editor->temporal_zoom_selection (Both); + return; + } + } + if (_operation == SelectionExtend) { if (_time_selection_at_start) { framepos_t pos = adjusted_current_frame (event, false); @@ -5386,15 +5450,15 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) framepos_t const pf = adjusted_current_frame (event); if (_operation == CreateSkipMarker || _operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker) { - framepos_t grab = grab_frame (); + MusicFrame grab (grab_frame (), 0); _editor->snap_to (grab); if (pf < grab_frame()) { start = pf; - end = grab; + end = grab.frame; } else { end = pf; - start = grab; + start = grab.frame; } /* first drag: Either add to the selection @@ -5464,7 +5528,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) } newloc = new Location ( *_editor->session(), _editor->temp_location->start(), _editor->temp_location->end(), rangename, (Location::Flags) flags - ); + , _editor->get_grid_music_divisions (event->button.state)); _editor->session()->locations()->add (newloc, true); XMLNode &after = _editor->session()->locations()->get_state(); @@ -5552,6 +5616,7 @@ NoteDrag::NoteDrag (Editor* e, ArdourCanvas::Item* i) , _cumulative_dx (0) , _cumulative_dy (0) , _was_selected (false) + , _copy (false) { DEBUG_TRACE (DEBUG::Drags, "New NoteDrag\n"); @@ -5565,6 +5630,13 @@ void NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *) { Drag::start_grab (event); + + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::CopyModifier)) { + _copy = true; + } else { + _copy = false; + } + setup_snap_delta (_region->source_beats_to_absolute_frames (_primary->note()->time ())); if (!(_was_selected = _primary->selected())) { @@ -5649,20 +5721,25 @@ 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 (_copy && first_move) { + /* make copies of all the selected notes */ + _primary = _region->copy_selection (); + } + /* Total change in x and y since the start of the drag */ frameoffset_t const dx = total_dx (event->button.state); int8_t const dy = total_dy (); @@ -5678,7 +5755,11 @@ NoteDrag::motion (GdkEvent * event, bool) int8_t note_delta = total_dy(); if (tdx || tdy) { - _region->move_selection (tdx, tdy, note_delta); + if (_copy) { + _region->move_copies (tdx, tdy, note_delta); + } else { + _region->move_selection (tdx, tdy, note_delta); + } /* the new note value may be the same as the old one, but we * don't know what that means because the selection may have @@ -5738,7 +5819,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->button.state), total_dy(), _copy); } } @@ -6188,13 +6269,12 @@ NoteCreateDrag::~NoteCreateDrag () framecnt_t NoteCreateDrag::grid_frames (framepos_t t) const { - bool success; - Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, t); - if (!success) { - grid_beats = Evoral::Beats(1); - } - return _region_view->region_beats_to_region_frames (grid_beats); + const Evoral::Beats grid_beats = _region_view->get_grid_beats (t); + const Evoral::Beats t_beats = _region_view->region_frames_to_region_beats (t); + + return _region_view->region_beats_to_region_frames (t_beats + grid_beats) + - _region_view->region_beats_to_region_frames (t_beats); } void @@ -6208,14 +6288,11 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) const framepos_t pf = _drags->current_pointer_frame (); const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); + double eqaf = map.exact_qn_at_frame (pf, divisions); if (divisions != 0) { - bool success = false; - Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf); - if (!success) { - grid_beats = Evoral::Beats(1); - } const double qaf = map.quarter_note_at_frame (pf); @@ -6230,13 +6307,14 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } _note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); - _note[1] = _note[0]; + /* minimum initial length is grid beats */ + _note[1] = map.frame_at_quarter_note (eqaf + grid_beats.to_double()) - _region_view->region()->position(); - MidiStreamView* sv = _region_view->midi_stream_view (); - double const x = _editor->sample_to_pixel (_note[0]); - double const y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y))); + double const x0 = _editor->sample_to_pixel (_note[0]); + double const x1 = _editor->sample_to_pixel (_note[1]); + double const y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); - _drag_rect->set (ArdourCanvas::Rect (x, y, x, y + floor (_region_view->midi_stream_view()->note_height ()))); + _drag_rect->set (ArdourCanvas::Rect (x0, y, x1, y + floor (_region_view->midi_stream_view()->note_height ()))); _drag_rect->set_outline_all (); _drag_rect->set_outline_color (0xffffff99); _drag_rect->set_fill_color (0xffffff66); @@ -6251,11 +6329,8 @@ NoteCreateDrag::motion (GdkEvent* event, bool) double eqaf = map.exact_qn_at_frame (pf, divisions); if (divisions != 0) { - bool success = false; - Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf); - if (!success) { - grid_beats = Evoral::Beats(1); - } + + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); const double qaf = map.quarter_note_at_frame (pf); /* Hack so that we always snap to the note that we are over, instead of snapping @@ -6280,25 +6355,20 @@ NoteCreateDrag::motion (GdkEvent* event, bool) void NoteCreateDrag::finished (GdkEvent* ev, bool had_movement) { - if (!had_movement) { - return; - } - + /* we create a note even if there was no movement */ framepos_t const start = min (_note[0], _note[1]); framepos_t const start_sess_rel = start + _region_view->region()->position(); - framecnt_t length = (framecnt_t) fabs ((double)(_note[0] - _note[1])); - + framecnt_t length = max (_editor->pixel_to_sample (1.0), (framecnt_t) fabs ((double)(_note[0] - _note[1]))); framecnt_t const g = grid_frames (start); - Evoral::Beats const one_tick = Evoral::Beats::ticks(1); if (_editor->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_frames (start_sess_rel, start_sess_rel + length); + Evoral::Beats qn_length_beats = max (Evoral::Beats::ticks(1), Evoral::Beats (qn_length)); - Evoral::Beats qn_length_beats = max (one_tick, Evoral::Beats (qn_length)); _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false); } @@ -6316,6 +6386,100 @@ NoteCreateDrag::aborted (bool) } +HitCreateDrag::HitCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv) + : Drag (e, i) + , _region_view (rv) + , _last_pos (0) + , _last_y (0.0) +{ +} + +HitCreateDrag::~HitCreateDrag () +{ +} + +void +HitCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + + TempoMap& map (_editor->session()->tempo_map()); + + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + const double eqaf = map.exact_qn_at_frame (pf, divisions); + + boost::shared_ptr mr = _region_view->midi_region(); + + if (eqaf >= mr->quarter_note() + mr->length_beats()) { + return; + } + + const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); + const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); + + Evoral::Beats length = _region_view->get_grid_beats (pf); + + _region_view->create_note_at (start, y, length, event->button.state, false); + + _last_pos = start; + _last_y = y; +} + +void +HitCreateDrag::motion (GdkEvent* event, bool) +{ + TempoMap& map (_editor->session()->tempo_map()); + + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + + if (divisions == 0) { + return; + } + + const double eqaf = map.exact_qn_at_frame (pf, divisions); + const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position (); + const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); + + if (_last_pos == start && y == _last_y) { + return; + } + + Evoral::Beats length = _region_view->get_grid_beats (pf); + + boost::shared_ptr mr = _region_view->midi_region(); + if (eqaf >= mr->quarter_note() + mr->length_beats()) { + return; + } + + _region_view->create_note_at (start, y, length, event->button.state, false); + + _last_pos = start; + _last_y = y; +} + +void +HitCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */) +{ + +} + +double +HitCreateDrag::y_to_region (double y) const +{ + double x = 0; + _region_view->get_canvas_group()->canvas_to_item (x, y); + return y; +} + +void +HitCreateDrag::aborted (bool) +{ + // umm.. +} + CrossfadeEdgeDrag::CrossfadeEdgeDrag (Editor* e, AudioRegionView* rv, ArdourCanvas::Item* i, bool start_yn) : Drag (e, i) , arv (rv) @@ -6418,6 +6582,7 @@ RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, framepos_t po { line->set_position (pos); line->show (); + line->track_canvas_item().reparent (_editor->_drag_motion_group); } RegionCutDrag::~RegionCutDrag () @@ -6426,12 +6591,19 @@ RegionCutDrag::~RegionCutDrag () } void -RegionCutDrag::motion (GdkEvent*, bool) +RegionCutDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +{ + Drag::start_grab (event, c); + motion (event, false); +} + +void +RegionCutDrag::motion (GdkEvent* event, bool) { - framepos_t where = _drags->current_pointer_frame(); - _editor->snap_to (where); + MusicFrame pos (_drags->current_pointer_frame(), 0); + _editor->snap_to_with_modifier (pos, event); - line->set_position (where); + line->set_position (pos.frame); } void @@ -6439,17 +6611,18 @@ RegionCutDrag::finished (GdkEvent* event, bool) { _editor->get_track_canvas()->canvas()->re_enter(); - framepos_t pos = _drags->current_pointer_frame(); + MusicFrame pos (_drags->current_pointer_frame(), 0); + _editor->snap_to_with_modifier (pos, event); line->hide (); - RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos); + RegionSelection rs = _editor->get_regions_from_selection_and_mouse (pos.frame); if (rs.empty()) { return; } - _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state)); + _editor->split_regions_at (pos, rs, false); } void