diff options
| author | Chris Robinson <[email protected]> | 2010-09-11 23:43:12 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-09-11 23:43:12 -0700 |
| commit | 1a2883ae9ad38f0c896fb711b28127e2c5ae37cd (patch) | |
| tree | 9dd7c85eb15c3bda0480f34a4c45c8624a110287 /Alc/mixer.c | |
| parent | a2358ffc418c125845c91a4247c46f56a2c32237 (diff) | |
Pass dry-path click buffers as parameters to MixSource
Diffstat (limited to 'Alc/mixer.c')
| -rw-r--r-- | Alc/mixer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index b286440f..32dc7917 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -79,13 +79,13 @@ static __inline ALfloat cos_lerp(ALfloat val1, ALfloat val2, ALint frac) static void MixSource(ALsource *ALSource, ALCcontext *ALContext, - float (*DryBuffer)[OUTPUTCHANNELS], ALuint SamplesToDo) + float (*DryBuffer)[OUTPUTCHANNELS], ALuint SamplesToDo, + ALfloat *ClickRemoval, ALfloat *PendingClicks) { static float DummyBuffer[BUFFERSIZE]; static ALfloat DummyClickRemoval[OUTPUTCHANNELS]; ALfloat *WetBuffer[MAX_SENDS]; ALfloat DrySend[OUTPUTCHANNELS]; - ALfloat *ClickRemoval, *PendingClicks; ALfloat *WetClickRemoval[MAX_SENDS]; ALfloat *WetPendingClicks[MAX_SENDS]; ALuint i, j, out; @@ -101,9 +101,6 @@ static void MixSource(ALsource *ALSource, ALCcontext *ALContext, ALboolean Looping; ALenum State; - ClickRemoval = ALContext->Device->ClickRemoval; - PendingClicks = ALContext->Device->PendingClicks; - if(ALSource->NeedsUpdate) { ALsource_Update(ALSource, ALContext); @@ -659,7 +656,8 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) *src = *(--src_end); continue; } - MixSource(*src, *ctx, DryBuffer, SamplesToDo); + MixSource(*src, *ctx, DryBuffer, SamplesToDo, + device->ClickRemoval, device->PendingClicks); src++; } |