Reorganize ALvoice members

This places the Send[] array at the end of the struct, making it easier to
handle dynamically.

2 files changed, 9 insertions, 10 deletions

diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index cc9dd763..c63aef70 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -95,19 +95,18 @@ typedef struct ALvoice {
     InterpState ResampleState;
 
     struct {
+        DirectParams Params[MAX_INPUT_CHANNELS];
+
         ALfloat (*Buffer)[BUFFERSIZE];
         ALsizei Channels;
-    } DirectOut;
+    } Direct;
 
     struct {
+        SendParams Params[MAX_INPUT_CHANNELS];
+
         ALfloat (*Buffer)[BUFFERSIZE];
         ALsizei Channels;
-    } SendOut[MAX_SENDS];
-
-    struct {
-        DirectParams Direct;
-        SendParams Send[MAX_SENDS];
-    } Chan[MAX_INPUT_CHANNELS];
+    } Send[MAX_SENDS];
 } ALvoice;
 
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 56d2b415..395bc8c2 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -3013,11 +3013,11 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
         {
             ALsizei j;
             for(j = 0;j < HRTF_HISTORY_LENGTH;j++)
-                voice->Chan[i].Direct.Hrtf.State.History[j] = 0.0f;
+                voice->Direct.Params[i].Hrtf.State.History[j] = 0.0f;
             for(j = 0;j < HRIR_LENGTH;j++)
             {
-                voice->Chan[i].Direct.Hrtf.State.Values[j][0] = 0.0f;
-                voice->Chan[i].Direct.Hrtf.State.Values[j][1] = 0.0f;
+                voice->Direct.Params[i].Hrtf.State.Values[j][0] = 0.0f;
+                voice->Direct.Params[i].Hrtf.State.Values[j][1] = 0.0f;
             }
         }