diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-02 13:09:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-02 13:09:03 +0000 |
| commit | a612857eb6024f75f11094d09def4ccbe621b7b4 (patch) | |
| tree | f5110f8cb0d5a8083cf7b8919247cbf39c6a5800 /gtk2_ardour/editor_ops.cc | |
| parent | 0c7b7216efc71e9b3851f1b43f2191a99619ff25 (diff) | |
make session restore work by using explicit data types when creating new playlists ... poses question - how did this ever compile before?
git-svn-id: svn://localhost/ardour2/branches/midi@1774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 917f93243e..95e0b5d255 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2823,21 +2823,19 @@ Editor::cut_copy_regions (CutCopyOp op) boost::shared_ptr<Region> r = (*x)->region(); boost::shared_ptr<Region> _xx; - + + assert (r != 0); + switch (op) { case Cut: - if (!r) break; - - _xx = RegionFactory::create ((*x)->region()); - npl->add_region (_xx, (*x)->region()->position() - first_position); - pl->remove_region (((*x)->region())); + _xx = RegionFactory::create (r); + npl->add_region (_xx, r->position() - first_position); + pl->remove_region (r); break; case Copy: - if (!r) break; - /* copy region before adding, so we're not putting same object into two different playlists */ - npl->add_region (RegionFactory::create ((*x)->region()), (*x)->region()->position() - first_position); + npl->add_region (RegionFactory::create (r, r->position() - first_position); break; case Clear: |