From 61755f35c1f0b54d827ef3bfbaaab860d8459357 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 9 Feb 2015 05:54:14 -0800 Subject: Move HRTF params and state closer together --- OpenAL32/Include/alu.h | 6 +++--- OpenAL32/alSource.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenAL32') 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++) -- cgit v1.2.3