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

fix incorrect loop check

Browse source
This commit is contained in:
derselbst 2017-08-11 15:05:19 +02:00
parent 05929af1dd
commit b04dbe3b9c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1963,7 +1963,7 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
/* loop is fowled?? (cluck cluck :) */ /* loop is fowled?? (cluck cluck :) */
if (sample->loopend > sample->end || if (sample->loopend > sample->end ||
sample->loopstart >= sample->loopend || sample->loopstart >= sample->loopend ||
sample->loopstart <= sample->start) sample->loopstart < sample->start)
{ {
/* can pad loop by 8 samples and ensure at least 4 for loop (2*8+4) */ /* can pad loop by 8 samples and ensure at least 4 for loop (2*8+4) */
if ((sample->end - sample->start) >= 20) if ((sample->end - sample->start) >= 20)
@ -3351,9 +3351,14 @@ fixup_sample (SFData * sf)
return (OK); return (OK);
} }
/* compressed samples get fixed up after decompression */
else if (sam->sampletype & FLUID_SAMPLETYPE_OGG_VORBIS) else if (sam->sampletype & FLUID_SAMPLETYPE_OGG_VORBIS)
{} {
/*
* compressed samples get fixed up after decompression
*
* however we cant use the logic below, because uncompressed samples are stored in individual buffers
*/
}
else if (invalid_loopstart || invalid_loopend || loopend_end_mismatch) else if (invalid_loopstart || invalid_loopend || loopend_end_mismatch)
{ {
/* loop is fowled?? (cluck cluck :) */ /* loop is fowled?? (cluck cluck :) */