Add storage for a default soundfont object

4 files changed, 8 insertions, 4 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index b4966028..cf843919 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -545,6 +545,9 @@ struct ALCdevice_struct
     // Map of Fontsounds for this device
     UIntMap FontsoundMap;
 
+    /* Default soundfont (accessible as ID 0) */
+    struct ALsoundfont *DefaultSfont;
+
     /* MIDI synth engine */
     struct MidiSynth *Synth;
 
diff --git a/OpenAL32/Include/alMidi.h b/OpenAL32/Include/alMidi.h
index e452a732..998f6e92 100644
--- a/OpenAL32/Include/alMidi.h
+++ b/OpenAL32/Include/alMidi.h
@@ -94,6 +94,7 @@ typedef struct ALfontsound {
     ALuint id;
 } ALfontsound;
 
+void ALfontsound_Destruct(ALfontsound *self);
 void ALfontsound_setPropi(ALfontsound *self, ALCcontext *context, ALenum param, ALint value);
 
 ALfontsound *NewFontsound(ALCcontext *context);
diff --git a/OpenAL32/alFontsound.c b/OpenAL32/alFontsound.c
index 4ec74ebc..540f726b 100644
--- a/OpenAL32/alFontsound.c
+++ b/OpenAL32/alFontsound.c
@@ -16,7 +16,7 @@ extern inline struct ALfontsound *LookupFontsound(ALCdevice *device, ALuint id);
 extern inline struct ALfontsound *RemoveFontsound(ALCdevice *device, ALuint id);
 
 static void ALfontsound_Construct(ALfontsound *self);
-static void ALfontsound_Destruct(ALfontsound *self);
+void ALfontsound_Destruct(ALfontsound *self);
 void ALfontsound_setPropi(ALfontsound *self, ALCcontext *context, ALenum param, ALint value);
 
 
@@ -541,7 +541,7 @@ static void ALfontsound_Construct(ALfontsound *self)
     self->id = 0;
 }
 
-static void ALfontsound_Destruct(ALfontsound *self)
+void ALfontsound_Destruct(ALfontsound *self)
 {
     ALsizei i;
 
diff --git a/OpenAL32/alPreset.c b/OpenAL32/alPreset.c
index 976e45f9..4188bf6c 100644
--- a/OpenAL32/alPreset.c
+++ b/OpenAL32/alPreset.c
@@ -16,7 +16,7 @@ extern inline struct ALsfpreset *LookupPreset(ALCdevice *device, ALuint id);
 extern inline struct ALsfpreset *RemovePreset(ALCdevice *device, ALuint id);
 
 static void ALsfpreset_Construct(ALsfpreset *self);
-static void ALsfpreset_Destruct(ALsfpreset *self);
+void ALsfpreset_Destruct(ALsfpreset *self);
 
 
 AL_API void AL_APIENTRY alGenPresetsSOFT(ALsizei n, ALuint *ids)
@@ -307,7 +307,7 @@ static void ALsfpreset_Construct(ALsfpreset *self)
     self->id = 0;
 }
 
-static void ALsfpreset_Destruct(ALsfpreset *self)
+void ALsfpreset_Destruct(ALsfpreset *self)
 {
     ALsizei i;