zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 05:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

yet another sample loop fix

Browse source
This commit is contained in:
Tom M 2017-08-04 16:33:11 +02:00 committed by GitHub
parent cbd3efc7c5
commit c149678912
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fluidsynth/src/sfloader/fluid_defsfont.c
View file

@ -3171,7 +3171,7 @@ fixup_sample (SFData * sf)
/* The SoundFont 2.4 spec defines the loop start index as the first sample point of the loop */ /* The SoundFont 2.4 spec defines the loop start index as the first sample point of the loop */
inv_start = (sam->loopstart < sam->start) || (sam->loopstart >= sam->loopend); inv_start = (sam->loopstart < sam->start) || (sam->loopstart >= sam->loopend);
/* while loop end is the first point AFTER the last sample of the loop */ /* while loop end is the first point AFTER the last sample of the loop */
inv_end = (sam->loopend > sam->end+1) || (sam->loopstart >= sam->loopend); inv_end = (sam->loopend > sam->end) || (sam->loopstart >= sam->loopend);
/* if sample is not a ROM sample and end is over the sample data chunk /* if sample is not a ROM sample and end is over the sample data chunk
or sam start is greater than 4 less than the end (at least 4 samples) */ or sam start is greater than 4 less than the end (at least 4 samples) */
@ -3203,6 +3203,7 @@ fixup_sample (SFData * sf)
{ {
FLUID_LOG (FLUID_DBG, _("Sample '%s' has invalid loop stop '%d'," FLUID_LOG (FLUID_DBG, _("Sample '%s' has invalid loop stop '%d',"
" setting to sample stop at '%d'-1"), sam->name, sam->loopend, sam->end); " setting to sample stop at '%d'-1"), sam->name, sam->loopend, sam->end);
/* since sam->end points after valid sample data, set loopend to last sample available */
sam->loopend = sam->end - 1; sam->loopend = sam->end - 1;
} }
} }