Move the input channel array out of the DirectParams and SendParams

2 files changed, 13 insertions, 15 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;