summaryrefslogtreecommitdiff
path: root/libs/ardour/playlist.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-05-25 22:44:30 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-05-25 22:44:30 +0000
commit884e147a9cdc130d41b59877738783c15c928d46 (patch)
treee637a3d5952ae124bd08063054c1e9d9b6f50ee3 /libs/ardour/playlist.cc
parentfa42d70b855007b4e6c3404ca8c98aed156b1b3d (diff)
restore compound region fade, where possible, to constituent regions, after uncombine
git-svn-id: svn://localhost/ardour2/branches/3.0@9593 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/playlist.cc')
-rw-r--r--libs/ardour/playlist.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 3ca4fddfb1..3c241cf846 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -3281,7 +3281,6 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
boost::shared_ptr<Region> current (*i);
-
RegionFactory::CompoundAssociations::iterator ca = cassocs.find (*i);
if (ca == cassocs.end()) {
@@ -3384,6 +3383,8 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
originals.push_back (original);
}
+ pre_uncombine (originals, target);
+
in_partition = true;
freeze ();