X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=cdbdf7fce8287b8e8c6ab8d889616bcd6f90d5b5;hb=f2c31a3098addc1ef2731e4db7132a821302bbc4;hp=0c046e56ab1eb188144e6edf6882619417760672;hpb=ac8617017ae94bf17cdd5b1f6e38e1434bcb2c54;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0c046e56ab..cdbdf7fce8 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" @@ -598,6 +599,29 @@ RegionDrag::find_time_axis_view (TimeAxisView* t) const return i; } +/** determines if @pos is the closest frame to an exact musical division when using SnapMagnetic. + * (SnapMagnetic may snap to an exact division or no division at all). + * this is a hotfix for musical region position/trim. we should really + * deliver musical divisors when snapping magnetically to avoid this. +*/ +int32_t +RegionDrag::current_music_divisor (framepos_t pos, int32_t button_state) +{ + int32_t divisions = _editor->get_grid_music_divisions (button_state); + + if (_editor->snap_mode() == Editing::SnapMagnetic && !ArdourKeyboard::indicates_snap (button_state)) { + TempoMap& tmap (_editor->session()->tempo_map()); + const framepos_t exact_qn_pos = tmap.frame_at_quarter_note (tmap.exact_qn_at_frame (pos, divisions)); + + if (pos != exact_qn_pos) { + /* magnetic has not snapped */ + divisions = 0; + } + } + + return divisions; +} + RegionMotionDrag::RegionMotionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v, bool b) : RegionDrag (e, i, p, v) , _brushing (b) @@ -1099,6 +1123,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 */ @@ -1160,6 +1188,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 */ @@ -1258,8 +1294,15 @@ 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; + + if (rv == _primary) { + region_copy = RegionFactory::create (original, true + , current_music_divisor (original->position(), event->button.state)); + } else { + region_copy = RegionFactory::create (original, true, 0); + } + /* 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 +1383,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; @@ -1380,8 +1422,6 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) ); } - - _editor->maybe_locate_with_edit_preroll (_editor->get_selection().regions.start()); } RouteTimeAxisView* @@ -1390,7 +1430,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,27 +1439,26 @@ 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 @@ -1429,6 +1468,10 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed PlaylistSet modified_playlists; RouteTimeAxisView* new_time_axis_view = 0; + int32_t divisor = current_music_divisor (_primary->region()->position() - drag_delta, ev_state); + TempoMap& tmap (_editor->session()->tempo_map()); + double qn_delta = _primary->region()->quarter_note() - tmap.exact_qn_at_frame (_primary->region()->position() - drag_delta, divisor); + if (_brushing) { /* all changes were made during motion event handlers */ @@ -1468,6 +1511,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 +1527,20 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed } if (dest_rtv != 0) { - RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, - modified_playlists, _editor->get_grid_music_divisions (ev_state)); + RegionView* new_view; + if (i->view == _primary) { + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, + modified_playlists, current_music_divisor (where, ev_state)); + } else { + if (i->view->region()->position_lock_style() == AudioTime) { + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, + modified_playlists, 0); + } else { + where = tmap.frame_at_quarter_note (i->view->region()->quarter_note() - qn_delta); + new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, + modified_playlists, 0); + } + } if (new_view != 0) { new_views.push_back (new_view); @@ -1529,6 +1588,11 @@ RegionMoveDrag::finished_no_copy ( typedef map, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; + int32_t divisor = current_music_divisor (_primary->region()->position() - drag_delta, ev_state); + TempoMap& tmap (_editor->session()->tempo_map()); + double qn_delta = _primary->region()->quarter_note() - tmap.exact_qn_at_frame (_primary->region()->position() - drag_delta, divisor); + + std::set > uniq; for (list::const_iterator i = _views.begin(); i != _views.end(); ) { RegionView* rv = i->view; @@ -1539,6 +1603,13 @@ RegionMoveDrag::finished_no_copy ( continue; } + if (uniq.find (rv->region()) != uniq.end()) { + /* prevent duplicate moves when selecting regions from shared playlists */ + ++i; + continue; + } + uniq.insert(rv->region()); + if (i->time_axis_view < 0 || i->time_axis_view >= (int)_time_axis_views.size()) { /* dragged to drop zone */ @@ -1547,6 +1618,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 { @@ -1576,11 +1651,27 @@ RegionMoveDrag::finished_no_copy ( 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, where, + modified_playlists, current_music_divisor (where, ev_state) + ); + } 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, + modified_playlists, 0 + ); + } else { + where = tmap.frame_at_quarter_note (rv->region()->quarter_note() - qn_delta); + new_view = insert_region_into_playlist ( + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, + modified_playlists, 0 + ); + } + } if (new_view == 0) { ++i; @@ -1638,8 +1729,16 @@ RegionMoveDrag::finished_no_copy ( if (r.second) { playlist->freeze (); } + if (rv == _primary) { + rv->region()->set_position (where, current_music_divisor (where, ev_state)); + } else { + if (rv->region()->position_lock_style() == AudioTime) { + rv->region()->set_position (where, 0); + } else { + rv->region()->set_position (tmap.frame_at_quarter_note (rv->region()->quarter_note() - qn_delta), 0); - rv->region()->set_position (where, _editor->get_grid_music_divisions (ev_state)); + } + } _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } @@ -2241,8 +2340,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; @@ -2914,12 +3012,13 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } } + int32_t divisions = current_music_divisor (adj_frame, event->button.state); 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)); + , divisions); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); @@ -2938,7 +3037,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, _editor->get_grid_music_divisions (event->button.state)); + bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, divisions); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -3023,18 +3122,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 { @@ -3087,10 +3174,11 @@ TrimDrag::aborted (bool movement_occurred) behind which may be slightly odd from the user's point of view. */ - finished (0, true); + GdkEvent ev; + finished (&ev, true); if (movement_occurred) { - _editor->undo (); + _editor->session()->undo (1); } for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { @@ -3188,8 +3276,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, map.frame_at_bbt (bbt), _real_section->position_lock_style()); + , beat, bbt, frame, _real_section->position_lock_style()); if (!_real_section) { aborted (true); return; @@ -3210,7 +3299,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)); @@ -3262,13 +3351,15 @@ MeterMarkerDrag::aborted (bool moved) TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) : Drag (e, i) , _copy (c) + , _grab_bpm (0.0) , before_state (0) { DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n"); _marker = reinterpret_cast (_item->get_data ("marker")); _real_section = &_marker->tempo(); - _movable = _real_section->movable(); + _movable = !_real_section->initial(); + _grab_bpm = _real_section->note_types_per_minute(); assert (_marker); } @@ -3301,7 +3392,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) // mvc drag - create a dummy marker to catch events, hide it. char name[64]; - snprintf (name, sizeof (name), "%.2f", _marker->tempo().beats_per_minute()); + snprintf (name, sizeof (name), "%.2f", _marker->tempo().note_types_per_minute()); TempoSection section (_marker->tempo()); @@ -3332,7 +3423,8 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) _editor->begin_reversible_command (_("copy tempo mark")); if (_real_section->position_lock_style() == MusicTime) { - _real_section = map.add_tempo (tempo, map.pulse_at_frame (frame), 0, type, MusicTime); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + _real_section = map.add_tempo (tempo, map.exact_qn_at_frame (frame, divisions), 0, type, MusicTime); } else { _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime); } @@ -3347,9 +3439,8 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) if (ArdourKeyboard::indicates_constraint (event->button.state)) { /* use vertical movement to alter tempo .. should be log */ - double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0); + double new_bpm = max (1.5, _grab_bpm + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); stringstream strs; - _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type())); strs << new_bpm; show_verbose_cursor_text (strs.str()); @@ -3371,7 +3462,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()); } @@ -3416,7 +3507,7 @@ TempoMarkerDrag::aborted (bool moved) BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i) - , _pulse (0.0) + , _grab_qn (0.0) , _tempo (0) , before_state (0) { @@ -3432,8 +3523,8 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _tempo = const_cast (&map.tempo_section_at_frame (raw_grab_frame())); ostringstream sstr; - sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n"; - sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).note_types_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); finished (event, false); } @@ -3456,9 +3547,9 @@ BBTRulerDrag::setup_pointer_frame_offset () beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4); } - _pulse = map.pulse_at_beat (beat); + _grab_qn = map.quarter_note_at_beat (beat); - _pointer_frame_offset = raw_grab_frame() - map.frame_at_pulse (_pulse); + _pointer_frame_offset = raw_grab_frame() - map.frame_at_quarter_note (_grab_qn); } @@ -3470,7 +3561,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; @@ -3483,11 +3574,11 @@ 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_pulse (_pulse), pf, _pulse); + _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf); } ostringstream sstr; - sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).beats_per_minute() << "\n"; - sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).note_types_per_minute() << "\n"; + sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -4108,6 +4199,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) { @@ -4125,8 +4218,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 { @@ -4136,27 +4228,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); } } } @@ -4233,6 +4325,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(); @@ -4251,9 +4344,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()) { @@ -4326,7 +4419,7 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) // start the grab at the center of the control point so // the point doesn't 'jump' to the mouse after the first drag - _fixed_grab_x = _point->get_x(); + _fixed_grab_x = _point->get_x() + _editor->sample_to_pixel_unrounded (_point->line().offset()); _fixed_grab_y = _point->get_y(); framepos_t pos = _editor->pixel_to_sample (_fixed_grab_x); @@ -4384,13 +4477,12 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion) } framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta (event->button.state); - if (!_x_constrained && need_snap) { _editor->snap_to_with_modifier (cx_frames, event); } cx_frames -= snap_delta (event->button.state); - cx_frames = min (cx_frames, _point->line().maximum_time()); + cx_frames = min (cx_frames, _point->line().maximum_time() + _point->line().offset()); float const fraction = 1.0 - (cy / _point->line().height()); @@ -5113,32 +5205,14 @@ 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 or remove as necessary + //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; - for (TrackViewList::const_iterator i = grouped_add.begin(); i != grouped_add.end(); ++i) + 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 ); - 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); - } } break; @@ -5222,10 +5296,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()); } } @@ -5240,6 +5311,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); @@ -5445,7 +5523,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(); @@ -5533,6 +5611,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"); @@ -5546,6 +5625,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())) { @@ -5577,12 +5663,14 @@ NoteDrag::total_dx (const guint state) const if (_x_constrained) { return 0; } + TempoMap& map (_editor->session()->tempo_map()); /* dx in frames */ frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x()); /* primary note time */ - frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ()); + double const quarter_note_start = _region->region()->quarter_note() - _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); @@ -5628,20 +5716,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 (); @@ -5657,7 +5750,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 @@ -5717,7 +5814,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); } } @@ -6167,13 +6264,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 @@ -6182,25 +6278,38 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Drag::start_grab (event, cursor); _drag_rect = new ArdourCanvas::Rectangle (_region_view->get_canvas_group ()); + TempoMap& map (_editor->session()->tempo_map()); - framepos_t pf = _drags->current_pointer_frame (); - framecnt_t const g = grid_frames (pf); + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); - /* Hack so that we always snap to the note that we are over, instead of snapping - to the next one if we're more than halfway through the one we're over. - */ - if (_editor->snap_mode() == SnapNormal && pf > g / 2) { - pf -= g / 2; + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); + + double eqaf = map.exact_qn_at_frame (pf, divisions); + + if (divisions != 0) { + + const double qaf = map.quarter_note_at_frame (pf); + + /* Hack so that we always snap to the note that we are over, instead of snapping + to the next one if we're more than halfway through the one we're over. + */ + + const double rem = eqaf - qaf; + if (rem >= 0.0) { + eqaf -= grid_beats.to_double(); + } } - _note[0] = adjusted_frame (pf, event) - _region_view->region()->position (); - _note[1] = _note[0]; + _note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position(); + /* minimum initial length is grid beats */ + _note[1] = map.frame_at_quarter_note (eqaf + grid_beats.to_double()) - _region_view->region()->position(); - MidiStreamView* sv = _region_view->midi_stream_view (); - double const x = _editor->sample_to_pixel (_note[0]); - double const y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y))); + double const x0 = _editor->sample_to_pixel (_note[0]); + double const x1 = _editor->sample_to_pixel (_note[1]); + double const y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y))); - _drag_rect->set (ArdourCanvas::Rect (x, y, x, y + floor (_region_view->midi_stream_view()->note_height ()))); + _drag_rect->set (ArdourCanvas::Rect (x0, y, x1, y + floor (_region_view->midi_stream_view()->note_height ()))); _drag_rect->set_outline_all (); _drag_rect->set_outline_color (0xffffff99); _drag_rect->set_fill_color (0xffffff66); @@ -6209,7 +6318,29 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) void NoteCreateDrag::motion (GdkEvent* event, bool) { - _note[1] = max ((framepos_t)0, adjusted_current_frame (event) - _region_view->region()->position ()); + TempoMap& map (_editor->session()->tempo_map()); + const framepos_t pf = _drags->current_pointer_frame (); + const int32_t divisions = _editor->get_grid_music_divisions (event->button.state); + double eqaf = map.exact_qn_at_frame (pf, divisions); + + if (divisions != 0) { + + const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf); + + const double qaf = map.quarter_note_at_frame (pf); + /* Hack so that we always snap to the note that we are over, instead of snapping + to the next one if we're more than halfway through the one we're over. + */ + + const double rem = eqaf - qaf; + if (rem >= 0.0) { + eqaf -= grid_beats.to_double(); + } + + eqaf += grid_beats.to_double(); + } + _note[1] = max ((framepos_t)0, map.frame_at_quarter_note (eqaf) - _region_view->region()->position ()); + double const x0 = _editor->sample_to_pixel (_note[0]); double const x1 = _editor->sample_to_pixel (_note[1]); _drag_rect->set_x0 (std::min(x0, x1)); @@ -6217,26 +6348,23 @@ NoteCreateDrag::motion (GdkEvent* event, bool) } void -NoteCreateDrag::finished (GdkEvent*, bool had_movement) +NoteCreateDrag::finished (GdkEvent* ev, bool had_movement) { - if (!had_movement) { - return; - } - + /* we create a note even if there was no movement */ framepos_t const start = min (_note[0], _note[1]); - framecnt_t length = (framecnt_t) fabs ((double)(_note[0] - _note[1])); - + framepos_t const start_sess_rel = start + _region_view->region()->position(); + framecnt_t length = max (_editor->pixel_to_sample (1.0), (framecnt_t) fabs ((double)(_note[0] - _note[1]))); framecnt_t const g = grid_frames (start); - Evoral::Beats const one_tick = Evoral::Beats::ticks(1); - if (_editor->snap_mode() == SnapNormal && length < g) { + if (_editor->get_grid_music_divisions (ev->button.state) != 0 && length < g) { length = g; } - Evoral::Beats length_beats = max ( - one_tick, _region_view->region_frames_to_region_beats (length) - one_tick); + TempoMap& map (_editor->session()->tempo_map()); + const double qn_length = map.quarter_notes_between_frames (start_sess_rel, start_sess_rel + length); + Evoral::Beats qn_length_beats = max (Evoral::Beats::ticks(1), Evoral::Beats (qn_length)); - _region_view->create_note_at (start, _drag_rect->y0(), length_beats, false); + _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false); } double @@ -6253,6 +6381,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) @@ -6355,6 +6577,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 () @@ -6363,12 +6586,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); + framepos_t pos = _drags->current_pointer_frame(); + _editor->snap_to_with_modifier (pos, event); - line->set_position (where); + line->set_position (pos); } void @@ -6377,6 +6607,7 @@ RegionCutDrag::finished (GdkEvent* event, bool) _editor->get_track_canvas()->canvas()->re_enter(); framepos_t pos = _drags->current_pointer_frame(); + _editor->snap_to_with_modifier (pos, event); line->hide (); @@ -6386,10 +6617,64 @@ RegionCutDrag::finished (GdkEvent* event, bool) return; } - _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state)); + _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state), + false); } void RegionCutDrag::aborted (bool) { } + +RulerZoomDrag::RulerZoomDrag (Editor* e, ArdourCanvas::Item* item) + : Drag (e, item, true) +{ +} + +void +RulerZoomDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +{ + Drag::start_grab (event, c); + + framepos_t where = _editor->canvas_event_sample(event); + + _editor->_dragging_playhead = true; + + _editor->playhead_cursor->set_position (where); +} + +void +RulerZoomDrag::motion (GdkEvent* event, bool) +{ + framepos_t where = _editor->canvas_event_sample(event); + + _editor->playhead_cursor->set_position (where); + + const double movement_limit = 20.0; + const double scale = 1.08; + const double y_delta = last_pointer_y() - current_pointer_y(); + + if (y_delta > 0 && y_delta < movement_limit) { + _editor->temporal_zoom_step_mouse_focus_scale (true, scale); + } else if (y_delta < 0 && y_delta > -movement_limit) { + _editor->temporal_zoom_step_mouse_focus_scale (false, scale); + } +} + +void +RulerZoomDrag::finished (GdkEvent*, bool) +{ + _editor->_dragging_playhead = false; + + Session* s = _editor->session (); + if (s) { + s->request_locate (_editor->playhead_cursor->current_frame (), _was_rolling); + _editor->_pending_locate_request = true; + } + +} + +void +RulerZoomDrag::aborted (bool) +{ +}