From 3240894cd5ee4d3bae6798b6d480ef2dfacc403a Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 14 Oct 2012 11:04:36 -0700
Subject: [PATCH] Remove the now-unused Source parameter from the DryMix
 methods

---
 Alc/mixer.c            |  4 ++--
 Alc/mixer_c.c          |  3 +--
 Alc/mixer_defs.h       | 11 +++++------
 Alc/mixer_inc.c        |  3 +--
 Alc/mixer_sse.c        |  3 +--
 OpenAL32/Include/alu.h |  3 +--
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Alc/mixer.c b/Alc/mixer.c
index 67efd70f..dc66577e 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -330,8 +330,8 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
 
                 Filter2P(&directparms->iirFilter, chan, SrcData, ResampledData,
                          DstBufferSize);
-                Source->Params.DryMix(Source, Device, directparms, SrcData,
-                                      chan, OutPos, SamplesToDo, DstBufferSize);
+                Source->Params.DryMix(Device, directparms, SrcData, chan,
+                                      OutPos, SamplesToDo, DstBufferSize);
             }
 
             for(j = 0;j < Device->NumAuxSends;j++)
diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c
index 027c4e37..39bf260c 100644
--- a/Alc/mixer_c.c
+++ b/Alc/mixer_c.c
@@ -83,7 +83,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
 #undef SUFFIX
 
 
-void MixDirect_C(ALsource *Source, ALCdevice *Device, DirectParams *params,
+void MixDirect_C(ALCdevice *Device, DirectParams *params,
   const ALfloat *RESTRICT data, ALuint srcchan,
   ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
 {
@@ -93,7 +93,6 @@ void MixDirect_C(ALsource *Source, ALCdevice *Device, DirectParams *params,
     ALfloat DrySend;
     ALuint pos;
     ALuint c;
-    (void)Source;
 
     for(c = 0;c < MaxChannels;c++)
     {
diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h
index f2a180fd..47c2d6f4 100644
--- a/Alc/mixer_defs.h
+++ b/Alc/mixer_defs.h
@@ -5,7 +5,6 @@
 #include "AL/al.h"
 #include "alMain.h"
 
-struct ALsource;
 struct DirectParams;
 struct SendParams;
 
@@ -17,16 +16,16 @@ void Resample_cubic32_C(const ALfloat *src, ALuint frac, ALuint increment, ALflo
 
 
 /* C mixers */
-void MixDirect_Hrtf_C(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
-void MixDirect_C(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
+void MixDirect_Hrtf_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
+void MixDirect_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
 void MixSend_C(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint);
 
 /* SSE mixers */
-void MixDirect_Hrtf_SSE(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
-void MixDirect_SSE(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
+void MixDirect_Hrtf_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
+void MixDirect_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
 void MixSend_SSE(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint);
 
 /* Neon mixers */
-void MixDirect_Hrtf_Neon(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
+void MixDirect_Hrtf_Neon(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
 
 #endif /* MIXER_DEFS_H */
diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c
index a581d5ac..349af440 100644
--- a/Alc/mixer_inc.c
+++ b/Alc/mixer_inc.c
@@ -29,7 +29,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
                                  ALfloat left, ALfloat right);
 
 
-void MixDirect_Hrtf(ALsource *Source, ALCdevice *Device, DirectParams *params,
+void MixDirect_Hrtf(ALCdevice *Device, DirectParams *params,
   const ALfloat *RESTRICT data, ALuint srcchan,
   ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
 {
@@ -50,7 +50,6 @@ void MixDirect_Hrtf(ALsource *Source, ALCdevice *Device, DirectParams *params,
     ALfloat left, right;
     ALuint pos;
     ALuint c;
-    (void)Source;
 
     pos = 0;
     for(c = 0;c < IrSize;c++)
diff --git a/Alc/mixer_sse.c b/Alc/mixer_sse.c
index f4b015d7..f1d51cc4 100644
--- a/Alc/mixer_sse.c
+++ b/Alc/mixer_sse.c
@@ -133,7 +133,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
 #undef SUFFIX
 
 
-void MixDirect_SSE(ALsource *Source, ALCdevice *Device, DirectParams *params,
+void MixDirect_SSE(ALCdevice *Device, DirectParams *params,
   const ALfloat *RESTRICT data, ALuint srcchan,
   ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
 {
@@ -143,7 +143,6 @@ void MixDirect_SSE(ALsource *Source, ALCdevice *Device, DirectParams *params,
     ALfloat DrySend;
     ALuint pos;
     ALuint c;
-    (void)Source;
 
     for(c = 0;c < MaxChannels;c++)
     {
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index d4339d96..2349d38f 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -88,8 +88,7 @@ struct SendParams;
 typedef void (*ResamplerFunc)(const ALfloat *src, ALuint frac, ALuint increment,
                               ALfloat *RESTRICT dst, ALuint dstlen);
 
-typedef ALvoid (*DryMixerFunc)(struct ALsource *self, ALCdevice *Device,
-                               struct DirectParams *params,
+typedef ALvoid (*DryMixerFunc)(ALCdevice *Device, struct DirectParams *params,
                                const ALfloat *RESTRICT data, ALuint srcchan,
                                ALuint OutPos, ALuint SamplesToDo,
                                ALuint BufferSize);
-- 
2.11.4.GIT