Allow "deleting" the default soundfont

The ID remains valid and the soundfont will be reloaded as needed, but this
provides a way for the application to clear up the soundfont memory.

1 files changed, 1 insertions, 48 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 97ac04bb..28e1efcb 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1950,54 +1950,7 @@ static ALCvoid FreeDevice(ALCdevice *device)
     }
 
     if(device->DefaultSfont)
-    {
-        ALsoundfont *sfont = device->DefaultSfont;
-        ALsfpreset **presets;
-        ALsizei num_presets;
-        ALsizei i;
-
-        presets = ExchangePtr((XchgPtr*)&sfont->Presets, NULL);
-        num_presets = ExchangeInt(&sfont->NumPresets, 0);
-
-        for(i = 0;i < num_presets;i++)
-        {
-            ALsfpreset *preset = presets[i];
-            ALfontsound **sounds;
-            ALsizei num_sounds;
-            ALboolean deleting;
-            ALsizei j;
-
-            sounds = ExchangePtr((XchgPtr*)&preset->Sounds, NULL);
-            num_sounds = ExchangeInt(&preset->NumSounds, 0);
-            DeletePreset(preset, device);
-            preset = NULL;
-
-            for(j = 0;j < num_sounds;j++)
-                DecrementRef(&sounds[j]->ref);
-            /* Some fontsounds may not be immediately deletable because they're
-             * linked to another fontsound. When those fontsounds are deleted
-             * they should become deletable, so use a loop until all fontsounds
-             * are deleted. */
-            do {
-                deleting = AL_FALSE;
-                for(j = 0;j < num_sounds;j++)
-                {
-                    if(sounds[j] && sounds[j]->ref == 0)
-                    {
-                        deleting = AL_TRUE;
-                        RemoveFontsound(device, sounds[j]->id);
-                        ALfontsound_Destruct(sounds[j]);
-                        free(sounds[j]);
-                        sounds[j] = NULL;
-                    }
-                }
-            } while(deleting);
-            free(sounds);
-        }
-
-        ALsoundfont_Destruct(sfont);
-        free(sfont);
-    }
+        MidiSynth_deleteSoundfont(device, device->DefaultSfont);
     device->DefaultSfont = NULL;
 
     if(device->BufferMap.size > 0)