3 files changed, 16 insertions, 18 deletions
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 2dd8229c..db138be1 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -51,8 +51,10 @@ typedef struct ALvoice {
         ALuint Channels;
     } SendOut[MAX_SENDS];
 
-    DirectParams Direct;
-    SendParams Send[MAX_SENDS];
+    struct {
+        DirectParams Direct;
+        SendParams Send[MAX_SENDS];
+    } Chan[MAX_INPUT_CHANNELS];
 } ALvoice;
 
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 266c0588..9913a117 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -125,35 +125,31 @@ typedef struct MixHrtfParams {
 } MixHrtfParams;
 
 typedef struct DirectParams {
-    struct {
-        enum ActiveFilters ActiveType;
-        ALfilterState LowPass;
-        ALfilterState HighPass;
-    } Filters[MAX_INPUT_CHANNELS];
+    enum ActiveFilters FilterType;
+    ALfilterState LowPass;
+    ALfilterState HighPass;
 
     struct {
         HrtfParams Current;
         HrtfParams Target;
         HrtfState State;
-    } Hrtf[MAX_INPUT_CHANNELS];
+    } Hrtf;
 
     struct {
         ALfloat Current[MAX_OUTPUT_CHANNELS];
         ALfloat Target[MAX_OUTPUT_CHANNELS];
-    } Gains[MAX_INPUT_CHANNELS];
+    } Gains;
 } DirectParams;
 
 typedef struct SendParams {
-    struct {
-        enum ActiveFilters ActiveType;
-        ALfilterState LowPass;
-        ALfilterState HighPass;
-    } Filters[MAX_INPUT_CHANNELS];
+    enum ActiveFilters FilterType;
+    ALfilterState LowPass;
+    ALfilterState HighPass;
 
     struct {
         ALfloat Current[MAX_OUTPUT_CHANNELS];
         ALfloat Target[MAX_OUTPUT_CHANNELS];
-    } Gains[MAX_INPUT_CHANNELS];
+    } Gains;
 } SendParams;
 
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 46467b01..4a50d217 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -3005,11 +3005,11 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
         {
             ALsizei j;
             for(j = 0;j < HRTF_HISTORY_LENGTH;j++)
-                voice->Direct.Hrtf[i].State.History[j] = 0.0f;
+                voice->Chan[i].Direct.Hrtf.State.History[j] = 0.0f;
             for(j = 0;j < HRIR_LENGTH;j++)
             {
-                voice->Direct.Hrtf[i].State.Values[j][0] = 0.0f;
-                voice->Direct.Hrtf[i].State.Values[j][1] = 0.0f;
+                voice->Chan[i].Direct.Hrtf.State.Values[j][0] = 0.0f;
+                voice->Chan[i].Direct.Hrtf.State.Values[j][1] = 0.0f;
             }
         }