Remove the effect slot parameter from the effect process method

7 files changed, 12 insertions, 18 deletions

diff --git a/Alc/ALu.c b/Alc/ALu.c
index 0446525c..2f505217 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -1009,7 +1009,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
                 if(!DeferUpdates && ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE))
                     ALEffect_Update((*slot)->EffectState, ctx, *slot);
 
-                ALEffect_Process((*slot)->EffectState, *slot, SamplesToDo,
+                ALEffect_Process((*slot)->EffectState, SamplesToDo,
                                  (*slot)->WetBuffer, device->DryBuffer);
 
                 for(i = 0;i < SamplesToDo;i++)
diff --git a/Alc/alcDedicated.c b/Alc/alcDedicated.c
index 307d60ef..a371bb20 100644
--- a/Alc/alcDedicated.c
+++ b/Alc/alcDedicated.c
@@ -75,12 +75,11 @@ static ALvoid DedicatedUpdate(ALeffectState *effect, ALCcontext *Context, const
         state->gains[LFE] = Gain;
 }
 
-static ALvoid DedicatedProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid DedicatedProcess(ALeffectState *effect, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     ALdedicatedState *state = (ALdedicatedState*)effect;
     const ALfloat *gains = state->gains;
     ALuint i, s;
-    (void)Slot;
 
     for(i = 0;i < SamplesToDo;i++)
     {
diff --git a/Alc/alcEcho.c b/Alc/alcEcho.c
index f5d1174f..76249d87 100644
--- a/Alc/alcEcho.c
+++ b/Alc/alcEcho.c
@@ -125,7 +125,7 @@ static ALvoid EchoUpdate(ALeffectState *effect, ALCcontext *Context, const ALeff
     }
 }
 
-static ALvoid EchoProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid EchoProcess(ALeffectState *effect, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     ALechoState *state = (ALechoState*)effect;
     const ALuint mask = state->BufferLength-1;
@@ -134,7 +134,6 @@ static ALvoid EchoProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuin
     ALuint offset = state->Offset;
     ALfloat samp[2], smp;
     ALuint i;
-    (void)Slot;
 
     for(i = 0;i < SamplesToDo;i++,offset++)
     {
diff --git a/Alc/alcModulator.c b/Alc/alcModulator.c
index e0ab5a1a..1a2ffd64 100644
--- a/Alc/alcModulator.c
+++ b/Alc/alcModulator.c
@@ -166,10 +166,9 @@ static ALvoid ModulatorUpdate(ALeffectState *effect, ALCcontext *Context, const
     }
 }
 
-static ALvoid ModulatorProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid ModulatorProcess(ALeffectState *effect, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     ALmodulatorState *state = (ALmodulatorState*)effect;
-    (void)Slot;
 
     switch(state->Waveform)
     {
diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c
index 562587e6..425b7052 100644
--- a/Alc/alcReverb.c
+++ b/Alc/alcReverb.c
@@ -522,13 +522,12 @@ static __inline ALvoid EAXVerbPass(ALverbState *State, ALfloat in, ALfloat *earl
 
 // This processes the reverb state, given the input samples and an output
 // buffer.
-static ALvoid VerbProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid VerbProcess(ALeffectState *effect, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     ALverbState *State = (ALverbState*)effect;
     ALuint index;
     ALfloat early[4], late[4], out[4];
     const ALfloat *panGain = State->Gain;
-    (void)Slot;
 
     for(index = 0;index < SamplesToDo;index++)
     {
@@ -555,12 +554,11 @@ static ALvoid VerbProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuin
 
 // This processes the EAX reverb state, given the input samples and an output
 // buffer.
-static ALvoid EAXVerbProcess(ALeffectState *effect, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid EAXVerbProcess(ALeffectState *effect, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     ALverbState *State = (ALverbState*)effect;
     ALuint index;
     ALfloat early[4], late[4];
-    (void)Slot;
 
     for(index = 0;index < SamplesToDo;index++)
     {
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 6f18993e..0ab0e2ab 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -42,7 +42,7 @@ struct ALeffectState {
     ALvoid (*Destroy)(ALeffectState *State);
     ALboolean (*DeviceUpdate)(ALeffectState *State, ALCdevice *Device);
     ALvoid (*Update)(ALeffectState *State, ALCcontext *Context, const ALeffectslot *Slot);
-    ALvoid (*Process)(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]);
+    ALvoid (*Process)(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]);
 };
 
 ALeffectState *NoneCreate(void);
@@ -51,10 +51,10 @@ ALeffectState *EchoCreate(void);
 ALeffectState *ModulatorCreate(void);
 ALeffectState *DedicatedCreate(void);
 
-#define ALEffect_Destroy(a)         ((a)->Destroy((a)))
-#define ALEffect_DeviceUpdate(a,b)  ((a)->DeviceUpdate((a),(b)))
-#define ALEffect_Update(a,b,c)      ((a)->Update((a),(b),(c)))
-#define ALEffect_Process(a,b,c,d,e) ((a)->Process((a),(b),(c),(d),(e)))
+#define ALEffect_Destroy(a)        ((a)->Destroy((a)))
+#define ALEffect_DeviceUpdate(a,b) ((a)->DeviceUpdate((a),(b)))
+#define ALEffect_Update(a,b,c)     ((a)->Update((a),(b),(c)))
+#define ALEffect_Process(a,b,c,d)  ((a)->Process((a),(b),(c),(d)))
 
 
 #ifdef __cplusplus
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 4596996b..33831d29 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -452,10 +452,9 @@ static ALvoid NoneUpdate(ALeffectState *State, ALCcontext *Context, const ALeffe
     (void)Context;
     (void)Slot;
 }
-static ALvoid NoneProcess(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid NoneProcess(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     (void)State;
-    (void)Slot;
     (void)SamplesToDo;
     (void)SamplesIn;
     (void)SamplesOut;