diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
| commit | b01bdb7e70f021da764e81a4b55722e746e4885d (patch) | |
| tree | 3f22af0fc8399bedd6843f7a9a4383295ac7b3cb /libs/ardour/audioregion.cc | |
| parent | 99d002dbdf2563bcad880628e7876aebe191ba0c (diff) | |
merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audioregion.cc')
| -rw-r--r-- | libs/ardour/audioregion.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 91654643d9..8034f3ddac 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -812,6 +812,10 @@ AudioRegion::set_fade_out (FadeShape shape, nframes_t len) void AudioRegion::set_fade_in_length (nframes_t len) { + if (len > _length) { + len = _length - 1; + } + bool changed = _fade_in->extend_to (len); if (changed) { @@ -823,13 +827,16 @@ AudioRegion::set_fade_in_length (nframes_t len) void AudioRegion::set_fade_out_length (nframes_t len) { + if (len > _length) { + len = _length - 1; + } + bool changed = _fade_out->extend_to (len); if (changed) { _flags = Flag (_flags & ~DefaultFadeOut); + send_change (FadeOutChanged); } - - send_change (FadeOutChanged); } void |