X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=a3b6664e57f4aeb5af57e62e6818861ef3dd4334;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=d2fd96e685f14943779812d992c706b2c228d091;hpb=24f64b3ea7386ace6d584503fe1397eb4f611dfe;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index d2fd96e685..a3b6664e57 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -44,7 +44,7 @@ #include "canvas/scroll_group.h" #include "editor.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "keyboard.h" #include "audio_region_view.h" #include "automation_region_view.h" @@ -510,7 +510,7 @@ Drag::show_verbose_cursor_text (string const & text) } boost::shared_ptr -Drag::add_midi_region (MidiTimeAxisView* view, bool commit) +Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_num) { if (_editor->session()) { const TempoMap& map (_editor->session()->tempo_map()); @@ -519,7 +519,7 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit) might be wrong. */ framecnt_t len = map.frame_at_beat (map.beat_at_frame (pos) + 1.0) - pos; - return view->add_region (grab_frame(), len, commit); + return view->add_region (grab_frame(), len, commit, sub_num); } return boost::shared_ptr(); @@ -527,7 +527,7 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit) struct PresentationInfoTimeAxisViewSorter { bool operator() (TimeAxisView* a, TimeAxisView* b) { - return a->presentation_info().order() < b->presentation_info().order(); + return a->stripable()->presentation_info().order() < b->stripable()->presentation_info().order(); } }; @@ -1256,8 +1256,8 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) MidiRegionView* mrv = dynamic_cast(rv); const boost::shared_ptr original = rv->region(); - boost::shared_ptr region_copy = RegionFactory::create (original, true); - region_copy->set_position (original->position()); + boost::shared_ptr region_copy = RegionFactory::create (original, true + , _editor->get_grid_music_divisions (event->button.state)); /* need to set this so that the drop zone code can work. This doesn't actually put the region into the playlist, but just sets a weak pointer to it. @@ -1364,7 +1364,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) finished_copy ( changed_position, changed_tracks, - drag_delta + drag_delta, + ev->button.state ); } else { @@ -1372,7 +1373,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) finished_no_copy ( changed_position, changed_tracks, - drag_delta + drag_delta, + ev->button.state ); } @@ -1395,22 +1397,22 @@ 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); - RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front()); - if (rtav) { - rtav->set_height (original->current_height()); + TimeAxisView* tav =_editor->axis_view_from_stripable (audio_tracks.front()); + if (tav) { + tav->set_height (original->current_height()); } - return rtav; + return dynamic_cast(tav); } else { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), (ARDOUR::Plugin::PresetRecord*) 0, (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); - RouteTimeAxisView* rtav = _editor->axis_view_from_route (midi_tracks.front()); - if (rtav) { - rtav->set_height (original->current_height()); + TimeAxisView* tav = _editor->axis_view_from_stripable (midi_tracks.front()); + if (tav) { + tav->set_height (original->current_height()); } - return rtav; + return dynamic_cast (tav); } } catch (...) { error << _("Could not create new track after region placed in the drop zone") << endmsg; @@ -1419,7 +1421,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, } void -RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta) +RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta, int32_t const ev_state) { RegionSelection new_views; PlaylistSet modified_playlists; @@ -1476,7 +1478,9 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed } if (dest_rtv != 0) { - RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, modified_playlists); + RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, + modified_playlists, _editor->get_grid_music_divisions (ev_state)); + if (new_view != 0) { new_views.push_back (new_view); } @@ -1510,7 +1514,8 @@ void RegionMoveDrag::finished_no_copy ( bool const changed_position, bool const changed_tracks, - framecnt_t const drag_delta + framecnt_t const drag_delta, + int32_t const ev_state ) { RegionSelection new_views; @@ -1571,7 +1576,8 @@ RegionMoveDrag::finished_no_copy ( /* insert into new playlist */ RegionView* new_view = insert_region_into_playlist ( - RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, + modified_playlists, _editor->get_grid_music_divisions (ev_state) ); if (new_view == 0) { @@ -1631,7 +1637,7 @@ RegionMoveDrag::finished_no_copy ( playlist->freeze (); } - rv->region()->set_position (where); + rv->region()->set_position (where, _editor->get_grid_music_divisions (ev_state)); _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } @@ -1734,7 +1740,8 @@ RegionMoveDrag::insert_region_into_playlist ( RouteTimeAxisView* dest_rtv, layer_t dest_layer, framecnt_t where, - PlaylistSet& modified_playlists + PlaylistSet& modified_playlists, + const int32_t sub_num ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); @@ -1751,8 +1758,7 @@ RegionMoveDrag::insert_region_into_playlist ( if (r.second) { dest_playlist->clear_changes (); } - - dest_playlist->add_region (region, where); + dest_playlist->add_region (region, where, 1.0, false, sub_num); if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { dest_playlist->set_layer (region, dest_layer); @@ -1876,7 +1882,7 @@ RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, Rout } void -RegionInsertDrag::finished (GdkEvent *, bool) +RegionInsertDrag::finished (GdkEvent * event, bool) { int pos = _views.front().time_axis_view; assert(pos >= 0 && pos < (int)_time_axis_views.size()); @@ -2303,7 +2309,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move) { if (first_move) { _editor->begin_reversible_command (_("create region")); - _region = add_midi_region (_view, false); + _region = add_midi_region (_view, false, _editor->get_grid_music_divisions (event->button.state)); _view->playlist()->freeze (); } else { if (_region) { @@ -2320,16 +2326,16 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move) */ framecnt_t const len = (framecnt_t) fabs ((double)(f - grab_frame () - 1)); - _region->set_length (len < 1 ? 1 : len); + _region->set_length (len < 1 ? 1 : len, _editor->get_grid_music_divisions (event->button.state)); } } } void -RegionCreateDrag::finished (GdkEvent*, bool movement_occurred) +RegionCreateDrag::finished (GdkEvent* event, bool movement_occurred) { if (!movement_occurred) { - add_midi_region (_view, true); + add_midi_region (_view, true, _editor->get_grid_music_divisions (event->button.state)); } else { _view->playlist()->thaw (); _editor->commit_reversible_command(); @@ -2911,7 +2917,9 @@ TrimDrag::motion (GdkEvent* event, bool first_move) switch (_operation) { case StartTrim: for (list::iterator i = _views.begin(); i != _views.end(); ++i) { - bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim); + bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim + , _editor->get_grid_music_divisions (event->button.state)); + if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -2929,7 +2937,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) case EndTrim: for (list::iterator i = _views.begin(); i != _views.end(); ++i) { - bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim); + bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, _editor->get_grid_music_divisions (event->button.state)); if (changed && _preserve_fade_anchor) { AudioRegionView* arv = dynamic_cast (i->view); if (arv) { @@ -3181,6 +3189,10 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) const double beat = map.beat_at_bbt (bbt); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style()); + if (!_real_section) { + aborted (true); + return; + } } /* only snap to bars. leave snap mode alone for audio locked meters.*/ @@ -3312,14 +3324,21 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) _editor->begin_reversible_command (_("move tempo mark")); } else { + const Tempo tempo (_marker->tempo()); const framepos_t frame = adjusted_current_frame (event) + 1; + const TempoSection::Type type = _real_section->type(); _editor->begin_reversible_command (_("copy tempo mark")); if (_real_section->position_lock_style() == MusicTime) { - _real_section = map.add_tempo (_marker->tempo(), map.pulse_at_frame (frame), 0, _real_section->type(), MusicTime); + _real_section = map.add_tempo (tempo, map.pulse_at_frame (frame), 0, type, MusicTime); } else { - _real_section = map.add_tempo (_marker->tempo(), 0.0, frame, _real_section->type(), AudioTime); + _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime); + } + + if (!_real_section) { + aborted (true); + return; } } @@ -3379,8 +3398,7 @@ TempoMarkerDrag::aborted (bool moved) if (moved) { TempoMap& map (_editor->session()->tempo_map()); map.set_state (*before_state, Stateful::current_state_version); - // delete the dummy marker we used for visual representation while moving. - // a new visual marker will show up automatically. + // delete the dummy (hidden) marker we used for events while moving. delete _marker; } } @@ -4226,6 +4244,10 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred) } else { location->set (((*x).location)->start(), ((*x).location)->end()); } + + if (location->is_session_range()) { + _editor->session()->set_end_is_free (false); + } } } @@ -4757,7 +4779,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred) /* MIDI track */ if (_editor->selection->empty() && _editor->mouse_mode == MouseDraw) { /* nothing selected */ - add_midi_region (mtv, true); + add_midi_region (mtv, true, _editor->get_grid_music_divisions(event->button.state)); do_deselect = false; } } @@ -6329,7 +6351,7 @@ RegionCutDrag::motion (GdkEvent*, bool) } void -RegionCutDrag::finished (GdkEvent*, bool) +RegionCutDrag::finished (GdkEvent* event, bool) { _editor->get_track_canvas()->canvas()->re_enter(); @@ -6343,7 +6365,7 @@ RegionCutDrag::finished (GdkEvent*, bool) return; } - _editor->split_regions_at (pos, rs); + _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state)); } void