diff options
author | Chris Robinson <[email protected]> | 2014-03-19 17:55:09 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2014-03-19 17:55:09 -0700 |
commit | 0c5cbafcd84df288c7f41e0ef06c9e3109b03365 (patch) | |
tree | adb8387ce0b38a6ae21cd2dbc42d84ed6f554f28 /Alc/mixer_inc.c | |
parent | 213e3ba4afc933e0cf0a5beefa040cbe4ef208cd (diff) |
Use a union to combine HRTF and non-HRTF mixer params
Diffstat (limited to 'Alc/mixer_inc.c')
-rw-r--r-- | Alc/mixer_inc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index da8a7b31..7f70d247 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -36,15 +36,15 @@ void MixDirect_Hrtf(const DirectParams *params, const ALfloat *restrict data, AL ALfloat (*restrict DryBuffer)[BUFFERSIZE] = params->OutBuffer; ALfloat *restrict ClickRemoval = params->ClickRemoval; ALfloat *restrict PendingClicks = params->PendingClicks; - const ALuint IrSize = params->Hrtf.Params.IrSize; - const ALint *restrict DelayStep = params->Hrtf.Params.DelayStep; - const ALfloat (*restrict CoeffStep)[2] = params->Hrtf.Params.CoeffStep; - const ALfloat (*restrict TargetCoeffs)[2] = params->Hrtf.Params.Coeffs[srcchan]; - const ALuint *restrict TargetDelay = params->Hrtf.Params.Delay[srcchan]; - ALfloat *restrict History = params->Hrtf.State->History[srcchan]; - ALfloat (*restrict Values)[2] = params->Hrtf.State->Values[srcchan]; - ALint Counter = maxu(params->Hrtf.State->Counter, OutPos) - OutPos; - ALuint Offset = params->Hrtf.State->Offset + OutPos; + const ALuint IrSize = params->Mix.Hrtf.Params.IrSize; + const ALint *restrict DelayStep = params->Mix.Hrtf.Params.DelayStep; + const ALfloat (*restrict CoeffStep)[2] = params->Mix.Hrtf.Params.CoeffStep; + const ALfloat (*restrict TargetCoeffs)[2] = params->Mix.Hrtf.Params.Coeffs[srcchan]; + const ALuint *restrict TargetDelay = params->Mix.Hrtf.Params.Delay[srcchan]; + ALfloat *restrict History = params->Mix.Hrtf.State->History[srcchan]; + ALfloat (*restrict Values)[2] = params->Mix.Hrtf.State->Values[srcchan]; + ALint Counter = maxu(params->Mix.Hrtf.State->Counter, OutPos) - OutPos; + ALuint Offset = params->Mix.Hrtf.State->Offset + OutPos; ALIGN(16) ALfloat Coeffs[HRIR_LENGTH][2]; ALuint Delay[2]; ALfloat left, right; |