diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-10 21:40:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-10 21:40:10 +0000 |
| commit | eaf548f49f6d2aba07e5eb4af65516760836eea2 (patch) | |
| tree | dfa98e44e1b745ccdde3838691c53dfd349c6e42 /libs | |
| parent | dc9fb4a033c64d9e91fc25bbc40abda8d9ee4eba (diff) | |
don't trim regions in conjunction with xfade trimming unless auto-xfade and full-overlap-xfades are selected
git-svn-id: svn://localhost/ardour2/branches/3.0@12245 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/audioregion.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 36d5cf0a8c..066cf368f5 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -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. |