Add a alMidiResetSOFT method to reset the synth

Playback is stopped, the queue is flushed, the clock is reset to 0, and the
MIDI system is reset to power-up status.

3 files changed, 28 insertions, 7 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 59237b0b..99ee54cf 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -287,6 +287,7 @@ static const ALCfunction alcFunctions[] = {
     DECL(alMidiPlaySOFT),
     DECL(alMidiPauseSOFT),
     DECL(alMidiStopSOFT),
+    DECL(alMidiResetSOFT),
     DECL(alMidiGainSOFT),
     DECL(alGetInteger64SOFT),
     DECL(alGetInteger64vSOFT),
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index e19ab487..64ab1174 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -45,6 +45,7 @@ typedef void (AL_APIENTRY*LPALMIDISYSEXSOFT)(ALuint64SOFT time, const ALbyte *da
 typedef void (AL_APIENTRY*LPALMIDIPLAYSOFT)(void);
 typedef void (AL_APIENTRY*LPALMIDIPAUSESOFT)(void);
 typedef void (AL_APIENTRY*LPALMIDISTOPSOFT)(void);
+typedef void (AL_APIENTRY*LPALMIDIRESETSOFT)(void);
 typedef void (AL_APIENTRY*LPALMIDIGAINSOFT)(ALfloat value);
 typedef ALint64SOFT (AL_APIENTRY*LPALGETINTEGER64SOFT)(ALenum pname);
 typedef void (AL_APIENTRY*LPALGETINTEGER64VSOFT)(ALenum pname, ALint64SOFT *values);
@@ -56,6 +57,7 @@ AL_API void AL_APIENTRY alMidiSysExSOFT(ALuint64SOFT time, const ALbyte *data, A
 AL_API void AL_APIENTRY alMidiPlaySOFT(void);
 AL_API void AL_APIENTRY alMidiPauseSOFT(void);
 AL_API void AL_APIENTRY alMidiStopSOFT(void);
+AL_API void AL_APIENTRY alMidiResetSOFT(void);
 AL_API void AL_APIENTRY alMidiGainSOFT(ALfloat value);
 AL_API ALint64SOFT AL_APIENTRY alGetInteger64SOFT(ALenum pname);
 AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values);
diff --git a/OpenAL32/alMidi.c b/OpenAL32/alMidi.c
index 2f87faad..cf634617 100644
--- a/OpenAL32/alMidi.c
+++ b/OpenAL32/alMidi.c
@@ -345,13 +345,8 @@ static void FSynth_stop(FSynth *self)
 
 static void FSynth_reset(FSynth *self)
 {
-    ALsizei chan;
-    /* All sounds off + reset all controllers */
-    for(chan = 0;chan < 16;chan++)
-    {
-        fluid_synth_cc(self->Synth, chan, 120, 0);
-        fluid_synth_cc(self->Synth, chan, 121, 0);
-    }
+    /* Reset to power-up status. */
+    fluid_synth_system_reset(self->Synth);
 
     MidiSynth_reset(STATIC_CAST(MidiSynth, self));
 }
@@ -795,6 +790,29 @@ AL_API void AL_APIENTRY alMidiStopSOFT(void)
     ALCcontext_DecRef(context);
 }
 
+AL_API void AL_APIENTRY alMidiResetSOFT(void)
+{
+    ALCdevice *device;
+    ALCcontext *context;
+    MidiSynth *synth;
+
+    context = GetContextRef();
+    if(!context) return;
+
+    device = context->Device;
+    synth = device->Synth;
+
+    WriteLock(&synth->Lock);
+    V(synth,setState)(AL_INITIAL);
+
+    ALCdevice_Lock(device);
+    V0(synth,reset)();
+    ALCdevice_Unlock(device);
+    WriteUnlock(&synth->Lock);
+
+    ALCcontext_DecRef(context);
+}
+
 
 AL_API void AL_APIENTRY alMidiGainSOFT(ALfloat value)
 {