allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

don't trim regions in conjunction with xfade trimming unless auto-xfade and full-overlap-xfades are selected

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12245 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2012-05-10 21:40:10 +00:00
parent dc9fb4a033
commit eaf548f49f
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/audioregion.cc
View File

@@ -1149,7 +1149,9 @@ AudioRegion::set_fade_in_length (framecnt_t len)
_inverse_fade_in->extend_to (len);
}
if (_fade_in_is_xfade) {
if (_session.config.get_xfade_model() == FullCrossfade &&
_session.config.get_auto_xfade() &&
_fade_in_is_xfade) {
/* trim a single other region below us to the new start
of the fade.
@@ -1161,7 +1163,6 @@ AudioRegion::set_fade_in_length (framecnt_t len)
}
}
_default_fade_in = false;
send_change (PropertyChange (Properties::fade_in));
}
@@ -1186,8 +1187,10 @@ AudioRegion::set_fade_out_length (framecnt_t len)
_inverse_fade_out->extend_to (len);
}
_default_fade_out = false;
if (_fade_out_is_xfade) {
if (_session.config.get_xfade_model() == FullCrossfade &&
_session.config.get_auto_xfade() &&
_fade_out_is_xfade) {
/* trim a single other region below us to the new start
of the fade.