From 2bf1979d4a805e661bdd43258a5020c96cda1f80 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 8 Sep 2012 22:32:30 -0700 Subject: Move the target effect slot to the SendParams struct --- OpenAL32/Include/alSource.h | 3 ++- OpenAL32/Include/alu.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenAL32') diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 0d9ac9f1..ace0b5b5 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -59,6 +59,8 @@ typedef struct DirectParams { } DirectParams; typedef struct SendParams { + struct ALeffectslot *Slot; + /* Gain control, which applies to all input channels to a single (mono) * output buffer. */ ALfloat Gain; @@ -154,7 +156,6 @@ typedef struct ALsource DirectParams Direct; - struct ALeffectslot *Slot[MAX_SENDS]; SendParams Send[MAX_SENDS]; } Params; /** Source needs to update its mixing parameters. */ diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 85d44221..d55f7269 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -113,8 +113,7 @@ typedef ALvoid (*DryMixerFunc)(struct ALsource *self, ALCdevice *Device, const ALfloat *RESTRICT data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize); -typedef ALvoid (*WetMixerFunc)(struct ALsource *self, ALuint sendidx, - struct SendParams *params, +typedef ALvoid (*WetMixerFunc)(struct SendParams *params, const ALfloat *RESTRICT data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize); -- cgit v1.2.3