diff options
author | Carl Hetherington <carl@carlh.net> | 2009-08-28 23:50:42 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-08-28 23:50:42 +0000 |
commit | 5cbfdb8bedc045401696559561a067b036165dab (patch) | |
tree | 5e72ca43e6113f185d76d8da9290acafa4a43de3 /gtk2_ardour | |
parent | 89a9b17ac98bc75029fc2023ca210c9de027a728 (diff) |
Remove some unnecessary code. Preserve selection when regions are dragged to new tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@5602 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index fcd859e83e..a8557dee4e 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -718,7 +718,7 @@ RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) vector<RegionView*> copies; boost::shared_ptr<Diskstream> ds; boost::shared_ptr<Playlist> from_playlist; - list<RegionView*> new_views; + RegionSelection new_views; typedef set<boost::shared_ptr<Playlist> > PlaylistSet; PlaylistSet modified_playlists; PlaylistSet frozen_playlists; @@ -952,18 +952,8 @@ RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) copies.push_back (rv); } } - - if (new_views.empty()) { - if (_copy) { - /* the region(view)s that are being dragged around are copies and do not - belong to any track. remove them from our list - */ - _views.clear (); - } - } else { - _views = new_views; - _primary = _views.front (); - } + + _editor->selection->add (new_views); for (set<boost::shared_ptr<Playlist> >::iterator p = frozen_playlists.begin(); p != frozen_playlists.end(); ++p) { (*p)->thaw(); |