ardour/livetrax
13
0
Fork 0
Code

reverse the use of copy_dependents() when uncombining a region, so that the right xfade shows up

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9633 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-05-30 13:55:06 +00:00
parent d4d5b30aeb
commit 14a80c091d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/playlist.cc
View File

@ -3193,6 +3193,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
boost::shared_ptr<PlaylistSource> pls;
boost::shared_ptr<const Playlist> pl;
vector<boost::shared_ptr<Region> > originals;
vector<TwoRegions> old_and_new_regions;
// (1) check that its really a compound region
@ -3323,6 +3324,7 @@ Playlist::uncombine (boost::shared_ptr<Region> 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<Region> 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 ();
}