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
This commit is contained in:
parent
d4d5b30aeb
commit
14a80c091d
@ -3193,6 +3193,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
|
|||||||
boost::shared_ptr<PlaylistSource> pls;
|
boost::shared_ptr<PlaylistSource> pls;
|
||||||
boost::shared_ptr<const Playlist> pl;
|
boost::shared_ptr<const Playlist> pl;
|
||||||
vector<boost::shared_ptr<Region> > originals;
|
vector<boost::shared_ptr<Region> > originals;
|
||||||
|
vector<TwoRegions> old_and_new_regions;
|
||||||
|
|
||||||
// (1) check that its really a compound region
|
// (1) check that its really a compound region
|
||||||
|
|
||||||
@ -3323,6 +3324,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
originals.push_back (original);
|
originals.push_back (original);
|
||||||
|
old_and_new_regions.push_back (TwoRegions (*i, original));
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_uncombine (originals, target);
|
pre_uncombine (originals, target);
|
||||||
@ -3340,6 +3342,10 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
|
|||||||
add_region ((*i), (*i)->position());
|
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;
|
in_partition = false;
|
||||||
thaw ();
|
thaw ();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user