diff options
author | Chris Robinson <[email protected]> | 2013-10-06 10:11:01 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2013-10-06 10:11:01 -0700 |
commit | 6425480d40e2a1b150c208db0421eabb51fe0624 (patch) | |
tree | 51e7c60d51b3a34f96f46237c6925017173cd32d /Alc/mixer_c.c | |
parent | 8448b94c0bf3f0ddbd040b25a68ff0ca2dcc37bd (diff) |
Don't store the effect slot in SendParams
This makes it much more like DirectParams.
Diffstat (limited to 'Alc/mixer_c.c')
-rw-r--r-- | Alc/mixer_c.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c index 045a8b1f..168aa43f 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer_c.c @@ -86,7 +86,7 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], void MixDirect_C(const DirectParams *params, const ALfloat *restrict data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) { - ALfloat (*restrict DryBuffer)[BUFFERSIZE] = params->OutBuffer; + ALfloat (*restrict OutBuffer)[BUFFERSIZE] = params->OutBuffer; ALfloat *restrict ClickRemoval = params->ClickRemoval; ALfloat *restrict PendingClicks = params->PendingClicks; ALfloat DrySend; @@ -102,7 +102,7 @@ void MixDirect_C(const DirectParams *params, const ALfloat *restrict data, ALuin if(OutPos == 0) ClickRemoval[c] -= data[0]*DrySend; for(pos = 0;pos < BufferSize;pos++) - DryBuffer[c][OutPos+pos] += data[pos]*DrySend; + OutBuffer[c][OutPos+pos] += data[pos]*DrySend; if(OutPos+pos == SamplesToDo) PendingClicks[c] += data[pos]*DrySend; } @@ -112,20 +112,20 @@ void MixDirect_C(const DirectParams *params, const ALfloat *restrict data, ALuin void MixSend_C(const SendParams *params, const ALfloat *restrict data, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) { - ALeffectslot *Slot = params->Slot; - ALfloat (*restrict WetBuffer)[BUFFERSIZE] = Slot->WetBuffer; - ALfloat *restrict WetClickRemoval = Slot->ClickRemoval; - ALfloat *restrict WetPendingClicks = Slot->PendingClicks; - ALfloat WetSend = params->Gain; + ALfloat (*restrict OutBuffer)[BUFFERSIZE] = params->OutBuffer; + ALfloat *restrict ClickRemoval = params->ClickRemoval; + ALfloat *restrict PendingClicks = params->PendingClicks; + ALfloat WetSend; ALuint pos; + WetSend = params->Gain; if(!(WetSend > 0.00001f)) return; if(OutPos == 0) - WetClickRemoval[0] -= data[0] * WetSend; + ClickRemoval[0] -= data[0] * WetSend; for(pos = 0;pos < BufferSize;pos++) - WetBuffer[0][OutPos+pos] += data[pos] * WetSend; + OutBuffer[0][OutPos+pos] += data[pos] * WetSend; if(OutPos+pos == SamplesToDo) - WetPendingClicks[0] += data[pos] * WetSend; + PendingClicks[0] += data[pos] * WetSend; } |