Remove setState from the MidiSynth vtable

5 files changed, 4 insertions, 15 deletions

diff --git a/Alc/midi/base.h b/Alc/midi/base.h
index a0c20d49..75332006 100644
--- a/Alc/midi/base.h
+++ b/Alc/midi/base.h
@@ -80,7 +80,6 @@ struct MidiSynthVtable {
     ALenum (*const selectSoundfonts)(MidiSynth *self, ALCcontext *context, ALsizei count, const ALuint *ids);
 
     void (*const setGain)(MidiSynth *self, ALfloat gain);
-    void (*const setState)(MidiSynth *self, ALenum state);
 
     void (*const stop)(MidiSynth *self);
     void (*const reset)(MidiSynth *self);
@@ -95,7 +94,6 @@ struct MidiSynthVtable {
 DECLARE_THUNK(T, MidiSynth, void, Destruct)                                   \
 DECLARE_THUNK3(T, MidiSynth, ALenum, selectSoundfonts, ALCcontext*, ALsizei, const ALuint*) \
 DECLARE_THUNK1(T, MidiSynth, void, setGain, ALfloat)                          \
-DECLARE_THUNK1(T, MidiSynth, void, setState, ALenum)                          \
 DECLARE_THUNK(T, MidiSynth, void, stop)                                       \
 DECLARE_THUNK(T, MidiSynth, void, reset)                                      \
 DECLARE_THUNK1(T, MidiSynth, void, update, ALCdevice*)                        \
@@ -108,7 +106,6 @@ static const struct MidiSynthVtable T##_MidiSynth_vtable = {                  \
                                                                               \
     T##_MidiSynth_selectSoundfonts,                                           \
     T##_MidiSynth_setGain,                                                    \
-    T##_MidiSynth_setState,                                                   \
     T##_MidiSynth_stop,                                                       \
     T##_MidiSynth_reset,                                                      \
     T##_MidiSynth_update,                                                     \
diff --git a/Alc/midi/dummy.c b/Alc/midi/dummy.c
index 07121051..d50b8fef 100644
--- a/Alc/midi/dummy.c
+++ b/Alc/midi/dummy.c
@@ -22,7 +22,6 @@ static void DSynth_Construct(DSynth *self, ALCdevice *device);
 static DECLARE_FORWARD(DSynth, MidiSynth, void, Destruct)
 static DECLARE_FORWARD3(DSynth, MidiSynth, ALenum, selectSoundfonts, ALCcontext*, ALsizei, const ALuint*)
 static DECLARE_FORWARD1(DSynth, MidiSynth, void, setGain, ALfloat)
-static DECLARE_FORWARD1(DSynth, MidiSynth, void, setState, ALenum)
 static DECLARE_FORWARD(DSynth, MidiSynth, void, stop)
 static DECLARE_FORWARD(DSynth, MidiSynth, void, reset)
 static DECLARE_FORWARD1(DSynth, MidiSynth, void, update, ALCdevice*)
diff --git a/Alc/midi/fluidsynth.c b/Alc/midi/fluidsynth.c
index 504b42ec..b4788635 100644
--- a/Alc/midi/fluidsynth.c
+++ b/Alc/midi/fluidsynth.c
@@ -470,7 +470,6 @@ static void FSynth_Destruct(FSynth *self);
 static ALboolean FSynth_init(FSynth *self, ALCdevice *device);
 static ALenum FSynth_selectSoundfonts(FSynth *self, ALCcontext *context, ALsizei count, const ALuint *ids);
 static void FSynth_setGain(FSynth *self, ALfloat gain);
-static void FSynth_setState(FSynth *self, ALenum state);
 static void FSynth_stop(FSynth *self);
 static void FSynth_reset(FSynth *self);
 static void FSynth_update(FSynth *self, ALCdevice *device);
@@ -632,11 +631,6 @@ static void FSynth_setGain(FSynth *self, ALfloat gain)
 }
 
 
-static void FSynth_setState(FSynth *self, ALenum state)
-{
-    MidiSynth_setState(STATIC_CAST(MidiSynth, self), state);
-}
-
 static void FSynth_stop(FSynth *self)
 {
     MidiSynth *synth = STATIC_CAST(MidiSynth, self);
diff --git a/Alc/midi/soft.c b/Alc/midi/soft.c
index cef3211b..7102ff7a 100644
--- a/Alc/midi/soft.c
+++ b/Alc/midi/soft.c
@@ -24,7 +24,6 @@ static void SSynth_Construct(SSynth *self, ALCdevice *device);
 static void SSynth_Destruct(SSynth *self);
 static DECLARE_FORWARD3(SSynth, MidiSynth, ALenum, selectSoundfonts, ALCcontext*, ALsizei, const ALuint*)
 static DECLARE_FORWARD1(SSynth, MidiSynth, void, setGain, ALfloat)
-static DECLARE_FORWARD1(SSynth, MidiSynth, void, setState, ALenum)
 static DECLARE_FORWARD(SSynth, MidiSynth, void, stop)
 static DECLARE_FORWARD(SSynth, MidiSynth, void, reset)
 static void SSynth_update(SSynth *self, ALCdevice *device);
diff --git a/OpenAL32/alMidi.c b/OpenAL32/alMidi.c
index 47ad8355..6313523e 100644
--- a/OpenAL32/alMidi.c
+++ b/OpenAL32/alMidi.c
@@ -135,7 +135,7 @@ AL_API void AL_APIENTRY alMidiPlaySOFT(void)
 
     synth = context->Device->Synth;
     WriteLock(&synth->Lock);
-    V(synth,setState)(AL_PLAYING);
+    MidiSynth_setState(synth, AL_PLAYING);
     WriteUnlock(&synth->Lock);
 
     ALCcontext_DecRef(context);
@@ -151,7 +151,7 @@ AL_API void AL_APIENTRY alMidiPauseSOFT(void)
 
     synth = context->Device->Synth;
     WriteLock(&synth->Lock);
-    V(synth,setState)(AL_PAUSED);
+    MidiSynth_setState(synth, AL_PAUSED);
     WriteUnlock(&synth->Lock);
 
     ALCcontext_DecRef(context);
@@ -170,7 +170,7 @@ AL_API void AL_APIENTRY alMidiStopSOFT(void)
     synth = device->Synth;
 
     WriteLock(&synth->Lock);
-    V(synth,setState)(AL_STOPPED);
+    MidiSynth_setState(synth, AL_STOPPED);
 
     ALCdevice_Lock(device);
     V0(synth,stop)();
@@ -193,7 +193,7 @@ AL_API void AL_APIENTRY alMidiResetSOFT(void)
     synth = device->Synth;
 
     WriteLock(&synth->Lock);
-    V(synth,setState)(AL_INITIAL);
+    MidiSynth_setState(synth, AL_INITIAL);
 
     ALCdevice_Lock(device);
     V0(synth,reset)();