zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-06-02 10:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.0.x' into master

Browse source
This commit is contained in:
derselbst 2019-10-22 11:39:42 +02:00
commit 41e77afe84
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sfloader/fluid_sfont.c
View file

@ -609,7 +609,7 @@ fluid_sample_set_sound_data(fluid_sample_t *sample,
goto error_rec; goto error_rec;
} }
FLUID_MEMSET(sample->data, 0, storedNbFrames); FLUID_MEMSET(sample->data, 0, storedNbFrames * sizeof(short));
FLUID_MEMCPY(sample->data + SAMPLE_LOOP_MARGIN, data, nbframes * sizeof(short)); FLUID_MEMCPY(sample->data + SAMPLE_LOOP_MARGIN, data, nbframes * sizeof(short));
if(data24 != NULL) if(data24 != NULL)
@ -628,7 +628,7 @@ fluid_sample_set_sound_data(fluid_sample_t *sample,
/* pointers */ /* pointers */
/* all from the start of data */ /* all from the start of data */
sample->start = SAMPLE_LOOP_MARGIN; sample->start = SAMPLE_LOOP_MARGIN;
sample->end = SAMPLE_LOOP_MARGIN + storedNbFrames - 1; sample->end = SAMPLE_LOOP_MARGIN + nbframes - 1;
} }
else else
{ {