Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep existing presets when loading in a new soundfont

Browse Source 
Note that alLoadSoundfontSOFT doesn't currently allow using a soundfont with
existing presets. This is for being able to load and stack multiple soundfonts
for the default soundfont.
This commit is contained in:
Chris Robinson
2014-07-19 12:42:52 -07:00
parent 85e135beea
commit 994c3f00e5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/midi/sf2load.c
+5 -3
View File
@@ -1245,9 +1245,11 @@ ALboolean loadSf2(Reader *stream, ALsoundfont *soundfont, ALCcontext *context)
if(!ensureFontSanity(&sfont))
goto error;
presets = calloc(1, (sfont.phdr_size-1)*sizeof(presets[0]));
presets = calloc(1, (soundfont->NumPresets+sfont.phdr_size-1)*sizeof(presets[0]));
if(!presets)
ERROR_GOTO(error, "Error allocating presets\n");
memcpy(presets, soundfont->Presets, soundfont->NumPresets*sizeof(presets[0]));
presets_size = soundfont->NumPresets;
for(i = 0;i < sfont.phdr_size-1;i++)
{
@@ -1341,7 +1343,7 @@ ALboolean loadSf2(Reader *stream, ALsoundfont *soundfont, ALCcontext *context)
GenModList_Destruct(&gzone);
}
for(i = 0;i < presets_size;i++)
for(i = soundfont->NumPresets;i < presets_size;i++)
IncrementRef(&presets[i]->ref);
presets = ExchangePtr((XchgPtr*)&soundfont->Presets, presets);
ExchangeInt(&soundfont->NumPresets, presets_size);
@@ -1359,7 +1361,7 @@ error:
if(presets)
{
ALCdevice *device = context->Device;
for(i = 0;i < presets_size;i++)
for(i = soundfont->NumPresets;i < presets_size;i++)
DeletePreset(device, presets[i]);
free(presets);
}