AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't destroy the fluid_sfont_t if any of its samples are still playing

Browse Source 
FluidSynth apparently doesn't check for this itself before calling the free
callback.
This commit is contained in:
Chris Robinson 2013-12-29 05:58:40 -08:00
parent 7640c658ee
commit 396a2f1595
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Alc/midi/fluidsynth.c
View File

@ -129,6 +129,18 @@ static void FPreset_Destruct(FPreset *self)
self->NumSamples = 0;
}
static ALboolean FPreset_canDelete(FPreset *self)
{
ALsizei i;
for(i = 0;i < self->NumSamples;i++)
{
if(fluid_sample_refcount(STATIC_CAST(fluid_sample_t, &self->Samples[i])) != 0)
return AL_FALSE;
}
return AL_TRUE;
}
static char* FPreset_getName(fluid_preset_t *preset)
{
return ((FPreset*)preset->data)->Name;
@ -265,6 +277,14 @@ static void FSfont_Destruct(FSfont *self)
static int FSfont_free(fluid_sfont_t *sfont)
{
FSfont *self = STATIC_UPCAST(FSfont, fluid_sfont_t, sfont);
ALsizei i;
for(i = 0;i < self->NumPresets;i++)
{
if(!FPreset_canDelete(&self->Presets[i]))
return 1;
}
FSfont_Destruct(self);
free(self);
return 0;