Move HRTF params and state closer together

4 files changed, 18 insertions, 18 deletions

diff --git a/Alc/ALu.c b/Alc/ALu.c
index af7ca616..0edf57bb 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -556,12 +556,12 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A
             if(chans[c].channel == LFE)
             {
                 /* Skip LFE */
-                voice->Direct.Hrtf.Params[c].Delay[0] = 0;
-                voice->Direct.Hrtf.Params[c].Delay[1] = 0;
+                voice->Direct.Hrtf[c].Params.Delay[0] = 0;
+                voice->Direct.Hrtf[c].Params.Delay[1] = 0;
                 for(i = 0;i < HRIR_LENGTH;i++)
                 {
-                    voice->Direct.Hrtf.Params[c].Coeffs[i][0] = 0.0f;
-                    voice->Direct.Hrtf.Params[c].Coeffs[i][1] = 0.0f;
+                    voice->Direct.Hrtf[c].Params.Coeffs[i][0] = 0.0f;
+                    voice->Direct.Hrtf[c].Params.Coeffs[i][1] = 0.0f;
                 }
             }
             else
@@ -570,8 +570,8 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A
                  * channel. */
                 GetLerpedHrtfCoeffs(Device->Hrtf,
                                     chans[c].elevation, chans[c].angle, 1.0f, DryGain,
-                                    voice->Direct.Hrtf.Params[c].Coeffs,
-                                    voice->Direct.Hrtf.Params[c].Delay);
+                                    voice->Direct.Hrtf[c].Params.Coeffs,
+                                    voice->Direct.Hrtf[c].Params.Delay);
             }
         }
         voice->Direct.Counter = 0;
@@ -1023,8 +1023,8 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
             {
                 ALuint counter = GetMovingHrtfCoeffs(Device->Hrtf,
                     ev, az, dirfact, DryGain, delta, voice->Direct.Counter,
-                    voice->Direct.Hrtf.Params[0].Coeffs, voice->Direct.Hrtf.Params[0].Delay,
-                    voice->Direct.Hrtf.Params[0].CoeffStep, voice->Direct.Hrtf.Params[0].DelayStep
+                    voice->Direct.Hrtf[0].Params.Coeffs, voice->Direct.Hrtf[0].Params.Delay,
+                    voice->Direct.Hrtf[0].Params.CoeffStep, voice->Direct.Hrtf[0].Params.DelayStep
                 );
                 voice->Direct.Counter = counter;
                 voice->Direct.LastGain = DryGain;
@@ -1035,8 +1035,8 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
         {
             /* Get the initial (static) HRIR coefficients and delays. */
             GetLerpedHrtfCoeffs(Device->Hrtf, ev, az, dirfact, DryGain,
-                                voice->Direct.Hrtf.Params[0].Coeffs,
-                                voice->Direct.Hrtf.Params[0].Delay);
+                                voice->Direct.Hrtf[0].Params.Coeffs,
+                                voice->Direct.Hrtf[0].Params.Delay);
             voice->Direct.Counter = 0;
             voice->Direct.Moving  = AL_TRUE;
             voice->Direct.LastGain = DryGain;
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 3e65ac72..e9ef6d79 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -468,8 +468,8 @@ ALvoid MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALuint Sam
                         parms->Counter, OutPos, DstBufferSize);
                 else
                     HrtfMix(parms->OutBuffer, samples, parms->Counter, voice->Offset,
-                            OutPos, IrSize, &parms->Hrtf.Params[chan],
-                            &parms->Hrtf.State[chan], DstBufferSize);
+                            OutPos, IrSize, &parms->Hrtf[chan].Params,
+                            &parms->Hrtf[chan].State, DstBufferSize);
             }
 
             /* Only the first channel for B-Format buffers (W channel) goes to
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index e4bcd409..50cde1bf 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -113,9 +113,9 @@ typedef struct DirectParams {
     } Filters[MAX_INPUT_CHANNELS];
 
     struct {
-        HrtfParams Params[MAX_INPUT_CHANNELS];
-        HrtfState State[MAX_INPUT_CHANNELS];
-    } Hrtf;
+        HrtfParams Params;
+        HrtfState State;
+    } Hrtf[MAX_INPUT_CHANNELS];
     MixGains Gains[MAX_INPUT_CHANNELS][MAX_OUTPUT_CHANNELS];
 } DirectParams;
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index b05b85c5..239c5380 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -2591,11 +2591,11 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
         {
             ALsizei j;
             for(j = 0;j < HRTF_HISTORY_LENGTH;j++)
-                voice->Direct.Hrtf.State[i].History[j] = 0.0f;
+                voice->Direct.Hrtf[i].State.History[j] = 0.0f;
             for(j = 0;j < HRIR_LENGTH;j++)
             {
-                voice->Direct.Hrtf.State[i].Values[j][0] = 0.0f;
-                voice->Direct.Hrtf.State[i].Values[j][1] = 0.0f;
+                voice->Direct.Hrtf[i].State.Values[j][0] = 0.0f;
+                voice->Direct.Hrtf[i].State.Values[j][1] = 0.0f;
             }
         }
         for(i = 0;i < (ALsizei)device->NumAuxSends;i++)