ardour/livetrax
13
0
Fork 0
Code

Fix loop cross-fade glitch #8420

Browse Source 
This fixes an off-by one when assigning `fade_length` and
also solves an edge-case with different fade length for
fade-in/fade-out.
This commit is contained in:
Robin Gareus 2020-09-25 16:33:55 +02:00
parent 7b0fdeda5e
commit c08298e6d8
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/ardour/disk_reader.cc
View File

@ -1668,13 +1668,20 @@ DiskReader::Declicker::alloc (samplecnt_t sr, bool fadein)
}
}
assert (n <= loop_fade_length);
assert (n > 0 && n <= loop_fade_length);
fade_length = n;
fade_length = n - 1;
/* zero out the rest just to be safe */
memset (&vec[n], 0, sizeof (gain_t) * (loop_fade_length - n));
/* Fill remaining fader-buffer with the target value.
*
* This is needed for loop x-fade. Due to float precision near 1.0, fade-in length
* is can be one or two samples shorter than fade-out length (depending on sample-rate).
* Summing the fade-in and fade-out curve over the complete fade-range (fade-out,
* as done by DiskReader::maybe_xfade_loop) must yield 1.0 +/- GAIN_COEFF_DELTA.
*/
for (; n < loop_fade_length; ++n) {
vec[n] = fadein ? 1.f : 0.f;
}
}
void