From 14a80c091d850045bd35c56d5d378bfdd2fbe4f9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 30 May 2011 13:55:06 +0000 Subject: [PATCH] reverse the use of copy_dependents() when uncombining a region, so that the right xfade shows up git-svn-id: svn://localhost/ardour2/branches/3.0@9633 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/playlist.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 6dd230c1ab..a9f57adc86 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -3193,6 +3193,7 @@ Playlist::uncombine (boost::shared_ptr target) boost::shared_ptr pls; boost::shared_ptr pl; vector > originals; + vector old_and_new_regions; // (1) check that its really a compound region @@ -3323,6 +3324,7 @@ Playlist::uncombine (boost::shared_ptr target) */ originals.push_back (original); + old_and_new_regions.push_back (TwoRegions (*i, original)); } pre_uncombine (originals, target); @@ -3340,6 +3342,10 @@ Playlist::uncombine (boost::shared_ptr target) add_region ((*i), (*i)->position()); } + /* now move dependent regions back from the compound to this playlist */ + + pl->copy_dependents (old_and_new_regions, this); + in_partition = false; thaw (); }