diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-21 03:02:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-21 03:02:30 +0000 |
| commit | 2c80ff4129040f0083318e689a9548444296009b (patch) | |
| tree | 48f44fc04bb069d3862da583616e0b017110f406 /gtk2_ardour/editor_drag.cc | |
| parent | ff356beda56953231c81d1f257b2993e42c0df93 (diff) | |
lincoln's patch that makes us pay attention to region copies w.r.t the region list, PLUS make region list insert drags work again by not insisting that the list of regionviews be non-empty as the drag is constructed PLUS the start of tracking mouse cursor position in MIDI notes PLUS a bit of leftover debugging info
git-svn-id: svn://localhost/ardour2/branches/3.0@7817 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 37f71c6026..f8047868f4 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -366,7 +366,8 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<Re } } - assert (!v.empty ()); + /* the list of views can be empty at this point if this is a region list-insert drag + */ for (list<RegionView*>::const_iterator i = v.begin(); i != v.end(); ++i) { _views.push_back (DraggingView (*i, this)); @@ -692,7 +693,7 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv); const boost::shared_ptr<const Region> original = rv->region(); - boost::shared_ptr<Region> region_copy = RegionFactory::create (original); + boost::shared_ptr<Region> region_copy = RegionFactory::create (original, true); region_copy->set_position (original->position(), this); RegionView* nrv; @@ -915,7 +916,7 @@ RegionMoveDrag::finished_no_copy ( /* insert into new playlist */ RegionView* new_view = insert_region_into_playlist ( - RegionFactory::create (rv->region ()), dest_rtv, dest_layer, where, modified_playlists + RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists ); if (new_view == 0) { |