From 71988944739d8daf2fda75ee709fa54af2f2f1f5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 29 May 2012 12:54:49 +0000 Subject: 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 --- libs/ardour/audio_playlist.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/ardour/audio_playlist.cc') diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 2ebbdd5131..2eb80a403e 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -421,14 +421,18 @@ AudioPlaylist::check_crossfades (Evoral::Range range) for (RegionList::iterator i = starts->begin(); i != starts->end(); ++i) { if (done_start.find (*i) == done_start.end()) { boost::shared_ptr r = boost::dynamic_pointer_cast (*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) { if (done_end.find (*i) == done_end.end()) { boost::shared_ptr r = boost::dynamic_pointer_cast (*i); - r->set_default_fade_out (); + if (r->fade_out_is_xfade()) { + r->set_default_fade_out (); + } } } } -- cgit v1.2.3