Pass the device to the mix function and localize the dry mix and click buffers

2 files changed, 4 insertions, 8 deletions

diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 448c9acc..41dda6bf 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -98,15 +98,13 @@ typedef struct ALsource
     } Params;
 
     ALvoid (*Update)(struct ALsource *self, const ALCcontext *context);
-    ALvoid (*Mix)(struct ALsource *self, ALuint SamplesToDo,
-                  ALfloat (*DryBuffer)[OUTPUTCHANNELS],
-                  ALfloat *ClickRemoval, ALfloat *PendingClicks);
+    ALvoid (*Mix)(struct ALsource *self, ALCdevice *Device, ALuint SamplesToDo);
 
     // Index to itself
     ALuint source;
 } ALsource;
-#define ALsource_Update(s,a)    ((s)->Update(s,a))
-#define ALsource_Mix(s,a,b,c,d) ((s)->Mix(s,a,b,c,d))
+#define ALsource_Update(s,a)  ((s)->Update(s,a))
+#define ALsource_Mix(s,a,b)   ((s)->Mix(s,a,b))
 
 ALvoid ReleaseALSources(ALCcontext *Context);
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 9f742e24..4d61b74d 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -189,9 +189,7 @@ ALvoid aluInitPanning(ALCdevice *Device);
 ALvoid CalcSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
 ALvoid CalcNonAttnSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
 
-ALvoid MixSource(struct ALsource *Source, ALuint SamplesToDo,
-                 ALfloat (*DryBuffer)[OUTPUTCHANNELS],
-                 ALfloat *ClickRemoval, ALfloat *PendingClicks);
+ALvoid MixSource(struct ALsource *Source, ALCdevice *Device, ALuint SamplesToDo);
 
 ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size);
 ALvoid aluHandleDisconnect(ALCdevice *device);