From 5f5c3fe8d2c3cf1bf91cce2dbdc37373c3c2f103 Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Fri, 29 Feb 2008 01:45:14 +0000 Subject: [PATCH] fix for broken fade out, appeared to be accidental var name redundancy git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3134 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audioregion.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index b6c1a131de..5b087011a9 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -577,7 +577,7 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit, /* fade out */ if (_flags & FadeOut) { - + /* see if some part of this read is within the fade out */ /* ................. >| REGION @@ -600,17 +600,17 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit, nframes_t fade_out_length = (nframes_t) _fade_out.back()->when; nframes_t fade_interval_start = max(internal_offset, limit-fade_out_length); nframes_t fade_interval_end = min(internal_offset + to_read, limit); - + if (fade_interval_end > fade_interval_start) { /* (part of the) the fade out is in this buffer */ - - nframes_t limit = fade_interval_end - fade_interval_start; + + nframes_t fo_limit = fade_interval_end - fade_interval_start; nframes_t curve_offset = fade_interval_start - (limit-fade_out_length); nframes_t fade_offset = fade_interval_start - internal_offset; - _fade_out.get_vector (curve_offset,curve_offset+limit, gain_buffer, limit); + _fade_out.get_vector (curve_offset,curve_offset+fo_limit, gain_buffer, fo_limit); - for (nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) { + for (nframes_t n = 0, m = fade_offset; n < fo_limit; ++n, ++m) { mixdown_buffer[m] *= gain_buffer[n]; } }