13
0

don't reset region fades to default after a playlist op unless the fades used to be part of an xfade and now no longer are (should fix #4893)

git-svn-id: svn://localhost/ardour2/branches/3.0@12476 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-29 12:54:49 +00:00
parent b397dafb86
commit 7198894473

View File

@ -421,14 +421,18 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
for (RegionList::iterator i = starts->begin(); i != starts->end(); ++i) { for (RegionList::iterator i = starts->begin(); i != starts->end(); ++i) {
if (done_start.find (*i) == done_start.end()) { if (done_start.find (*i) == done_start.end()) {
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (*i); boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (*i);
r->set_default_fade_in (); if (r->fade_in_is_xfade()) {
r->set_default_fade_in ();
}
} }
} }
for (RegionList::iterator i = ends->begin(); i != ends->end(); ++i) { for (RegionList::iterator i = ends->begin(); i != ends->end(); ++i) {
if (done_end.find (*i) == done_end.end()) { if (done_end.find (*i) == done_end.end()) {
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (*i); boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (*i);
r->set_default_fade_out (); if (r->fade_out_is_xfade()) {
r->set_default_fade_out ();
}
} }
} }
} }