diff options
Diffstat (limited to 'Alc/ALu.c')
| -rw-r--r-- | Alc/ALu.c | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -365,12 +365,12 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) if(chans[c].channel == LFE) { /* Skip LFE */ - ALSource->Params.Direct.Hrtf.Delay[c][0] = 0; - ALSource->Params.Direct.Hrtf.Delay[c][1] = 0; + ALSource->Params.Direct.Hrtf.Params.Delay[c][0] = 0; + ALSource->Params.Direct.Hrtf.Params.Delay[c][1] = 0; for(i = 0;i < HRIR_LENGTH;i++) { - ALSource->Params.Direct.Hrtf.Coeffs[c][i][0] = 0.0f; - ALSource->Params.Direct.Hrtf.Coeffs[c][i][1] = 0.0f; + ALSource->Params.Direct.Hrtf.Params.Coeffs[c][i][0] = 0.0f; + ALSource->Params.Direct.Hrtf.Params.Coeffs[c][i][1] = 0.0f; } } else @@ -379,14 +379,14 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) * channel. */ GetLerpedHrtfCoeffs(Device->Hrtf, 0.0f, chans[c].angle, DryGain, - ALSource->Params.Direct.Hrtf.Coeffs[c], - ALSource->Params.Direct.Hrtf.Delay[c]); + ALSource->Params.Direct.Hrtf.Params.Coeffs[c], + ALSource->Params.Direct.Hrtf.Params.Delay[c]); } } ALSource->Hrtf.Counter = 0; - ALSource->Params.Direct.Hrtf.IrSize = GetHrtfIrSize(Device->Hrtf); + ALSource->Params.Direct.Hrtf.Params.IrSize = GetHrtfIrSize(Device->Hrtf); - ALSource->Params.Direct.hrtfState = &ALSource->Hrtf; + ALSource->Params.Direct.Hrtf.State = &ALSource->Hrtf; } else { @@ -794,8 +794,8 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) if(ALSource->Hrtf.Moving) { /* Calculate the normalized HRTF transition factor (delta). */ - delta = CalcHrtfDelta(ALSource->Params.Direct.Hrtf.Gain, DryGain, - ALSource->Params.Direct.Hrtf.Dir, Position); + delta = CalcHrtfDelta(ALSource->Params.Direct.Hrtf.Params.Gain, DryGain, + ALSource->Params.Direct.Hrtf.Params.Dir, Position); /* If the delta is large enough, get the moving HRIR target * coefficients, target delays, steppping values, and counter. */ if(delta > 0.001f) @@ -803,32 +803,32 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALSource->Hrtf.Counter = GetMovingHrtfCoeffs(Device->Hrtf, ev, az, DryGain, delta, ALSource->Hrtf.Counter, - ALSource->Params.Direct.Hrtf.Coeffs[0], - ALSource->Params.Direct.Hrtf.Delay[0], - ALSource->Params.Direct.Hrtf.CoeffStep, - ALSource->Params.Direct.Hrtf.DelayStep); - ALSource->Params.Direct.Hrtf.Gain = DryGain; - ALSource->Params.Direct.Hrtf.Dir[0] = Position[0]; - ALSource->Params.Direct.Hrtf.Dir[1] = Position[1]; - ALSource->Params.Direct.Hrtf.Dir[2] = Position[2]; + ALSource->Params.Direct.Hrtf.Params.Coeffs[0], + ALSource->Params.Direct.Hrtf.Params.Delay[0], + ALSource->Params.Direct.Hrtf.Params.CoeffStep, + ALSource->Params.Direct.Hrtf.Params.DelayStep); + ALSource->Params.Direct.Hrtf.Params.Gain = DryGain; + ALSource->Params.Direct.Hrtf.Params.Dir[0] = Position[0]; + ALSource->Params.Direct.Hrtf.Params.Dir[1] = Position[1]; + ALSource->Params.Direct.Hrtf.Params.Dir[2] = Position[2]; } } else { /* Get the initial (static) HRIR coefficients and delays. */ GetLerpedHrtfCoeffs(Device->Hrtf, ev, az, DryGain, - ALSource->Params.Direct.Hrtf.Coeffs[0], - ALSource->Params.Direct.Hrtf.Delay[0]); + ALSource->Params.Direct.Hrtf.Params.Coeffs[0], + ALSource->Params.Direct.Hrtf.Params.Delay[0]); ALSource->Hrtf.Counter = 0; ALSource->Hrtf.Moving = AL_TRUE; - ALSource->Params.Direct.Hrtf.Gain = DryGain; - ALSource->Params.Direct.Hrtf.Dir[0] = Position[0]; - ALSource->Params.Direct.Hrtf.Dir[1] = Position[1]; - ALSource->Params.Direct.Hrtf.Dir[2] = Position[2]; + ALSource->Params.Direct.Hrtf.Params.Gain = DryGain; + ALSource->Params.Direct.Hrtf.Params.Dir[0] = Position[0]; + ALSource->Params.Direct.Hrtf.Params.Dir[1] = Position[1]; + ALSource->Params.Direct.Hrtf.Params.Dir[2] = Position[2]; } - ALSource->Params.Direct.Hrtf.IrSize = GetHrtfIrSize(Device->Hrtf); + ALSource->Params.Direct.Hrtf.Params.IrSize = GetHrtfIrSize(Device->Hrtf); - ALSource->Params.Direct.hrtfState = &ALSource->Hrtf; + ALSource->Params.Direct.Hrtf.State = &ALSource->Hrtf; } else { |