Invert the device channel map

3 files changed, 109 insertions, 137 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 6f165fb9..8d1792c3 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -2440,22 +2440,22 @@ void SetDefaultChannelOrder(ALCdevice *device)
 {
     switch(device->FmtChans)
     {
-    case DevFmtX51: device->DevChannels[FRONT_LEFT]   = 0;
-                    device->DevChannels[FRONT_RIGHT]  = 1;
-                    device->DevChannels[BACK_LEFT]    = 2;
-                    device->DevChannels[BACK_RIGHT]   = 3;
-                    device->DevChannels[FRONT_CENTER] = 4;
-                    device->DevChannels[LFE]          = 5;
+    case DevFmtX51: device->DevChannels[0] = FRONT_LEFT;
+                    device->DevChannels[1] = FRONT_RIGHT;
+                    device->DevChannels[2] = BACK_LEFT;
+                    device->DevChannels[3] = BACK_RIGHT;
+                    device->DevChannels[4] = FRONT_CENTER;
+                    device->DevChannels[5] = LFE;
                     return;
 
-    case DevFmtX71: device->DevChannels[FRONT_LEFT]   = 0;
-                    device->DevChannels[FRONT_RIGHT]  = 1;
-                    device->DevChannels[BACK_LEFT]    = 2;
-                    device->DevChannels[BACK_RIGHT]   = 3;
-                    device->DevChannels[FRONT_CENTER] = 4;
-                    device->DevChannels[LFE]          = 5;
-                    device->DevChannels[SIDE_LEFT]    = 6;
-                    device->DevChannels[SIDE_RIGHT]   = 7;
+    case DevFmtX71: device->DevChannels[0] = FRONT_LEFT;
+                    device->DevChannels[1] = FRONT_RIGHT;
+                    device->DevChannels[2] = BACK_LEFT;
+                    device->DevChannels[3] = BACK_RIGHT;
+                    device->DevChannels[4] = FRONT_CENTER;
+                    device->DevChannels[5] = LFE;
+                    device->DevChannels[6] = SIDE_LEFT;
+                    device->DevChannels[7] = SIDE_RIGHT;
                     return;
 
     /* Same as WFX order */
@@ -2473,46 +2473,46 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
 {
     switch(device->FmtChans)
     {
-    case DevFmtMono: device->DevChannels[FRONT_CENTER] = 0; break;
-
-    case DevFmtStereo: device->DevChannels[FRONT_LEFT]  = 0;
-                       device->DevChannels[FRONT_RIGHT] = 1; break;
-
-    case DevFmtQuad: device->DevChannels[FRONT_LEFT]  = 0;
-                     device->DevChannels[FRONT_RIGHT] = 1;
-                     device->DevChannels[BACK_LEFT]   = 2;
-                     device->DevChannels[BACK_RIGHT]  = 3; break;
-
-    case DevFmtX51: device->DevChannels[FRONT_LEFT]   = 0;
-                    device->DevChannels[FRONT_RIGHT]  = 1;
-                    device->DevChannels[FRONT_CENTER] = 2;
-                    device->DevChannels[LFE]          = 3;
-                    device->DevChannels[BACK_LEFT]    = 4;
-                    device->DevChannels[BACK_RIGHT]   = 5; break;
-
-    case DevFmtX51Side: device->DevChannels[FRONT_LEFT]   = 0;
-                        device->DevChannels[FRONT_RIGHT]  = 1;
-                        device->DevChannels[FRONT_CENTER] = 2;
-                        device->DevChannels[LFE]          = 3;
-                        device->DevChannels[SIDE_LEFT]    = 4;
-                        device->DevChannels[SIDE_RIGHT]   = 5; break;
-
-    case DevFmtX61: device->DevChannels[FRONT_LEFT]   = 0;
-                    device->DevChannels[FRONT_RIGHT]  = 1;
-                    device->DevChannels[FRONT_CENTER] = 2;
-                    device->DevChannels[LFE]          = 3;
-                    device->DevChannels[BACK_CENTER]  = 4;
-                    device->DevChannels[SIDE_LEFT]    = 5;
-                    device->DevChannels[SIDE_RIGHT]   = 6; break;
-
-    case DevFmtX71: device->DevChannels[FRONT_LEFT]   = 0;
-                    device->DevChannels[FRONT_RIGHT]  = 1;
-                    device->DevChannels[FRONT_CENTER] = 2;
-                    device->DevChannels[LFE]          = 3;
-                    device->DevChannels[BACK_LEFT]    = 4;
-                    device->DevChannels[BACK_RIGHT]   = 5;
-                    device->DevChannels[SIDE_LEFT]    = 6;
-                    device->DevChannels[SIDE_RIGHT]   = 7; break;
+    case DevFmtMono: device->DevChannels[0] = FRONT_CENTER; break;
+
+    case DevFmtStereo: device->DevChannels[0] = FRONT_LEFT;
+                       device->DevChannels[1] = FRONT_RIGHT; break;
+
+    case DevFmtQuad: device->DevChannels[0] = FRONT_LEFT;
+                     device->DevChannels[1] = FRONT_RIGHT;
+                     device->DevChannels[2] = BACK_LEFT;
+                     device->DevChannels[3] = BACK_RIGHT; break;
+
+    case DevFmtX51: device->DevChannels[0] = FRONT_LEFT;
+                    device->DevChannels[1] = FRONT_RIGHT;
+                    device->DevChannels[2] = FRONT_CENTER;
+                    device->DevChannels[3] = LFE;
+                    device->DevChannels[4] = BACK_LEFT;
+                    device->DevChannels[5] = BACK_RIGHT; break;
+
+    case DevFmtX51Side: device->DevChannels[0] = FRONT_LEFT;
+                        device->DevChannels[1] = FRONT_RIGHT;
+                        device->DevChannels[2] = FRONT_CENTER;
+                        device->DevChannels[3] = LFE;
+                        device->DevChannels[4] = SIDE_LEFT;
+                        device->DevChannels[5] = SIDE_RIGHT; break;
+
+    case DevFmtX61: device->DevChannels[0] = FRONT_LEFT;
+                    device->DevChannels[1] = FRONT_RIGHT;
+                    device->DevChannels[2] = FRONT_CENTER;
+                    device->DevChannels[3] = LFE;
+                    device->DevChannels[4] = BACK_CENTER;
+                    device->DevChannels[5] = SIDE_LEFT;
+                    device->DevChannels[6] = SIDE_RIGHT; break;
+
+    case DevFmtX71: device->DevChannels[0] = FRONT_LEFT;
+                    device->DevChannels[1] = FRONT_RIGHT;
+                    device->DevChannels[2] = FRONT_CENTER;
+                    device->DevChannels[3] = LFE;
+                    device->DevChannels[4] = BACK_LEFT;
+                    device->DevChannels[5] = BACK_RIGHT;
+                    device->DevChannels[6] = SIDE_LEFT;
+                    device->DevChannels[7] = SIDE_RIGHT; break;
     }
 }
 
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 8a81aad1..54f99d32 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -843,83 +843,59 @@ static __inline ALbyte aluF2B(ALfloat val)
     return i>>8;
 }
 
-static const enum Channel MonoChans[] = { FRONT_CENTER };
-static const enum Channel StereoChans[] = { FRONT_LEFT, FRONT_RIGHT };
-static const enum Channel QuadChans[] = { FRONT_LEFT, FRONT_RIGHT,
-                                          BACK_LEFT, BACK_RIGHT };
-static const enum Channel X51Chans[] = { FRONT_LEFT, FRONT_RIGHT,
-                                         FRONT_CENTER, LFE,
-                                         BACK_LEFT, BACK_RIGHT };
-static const enum Channel X51SideChans[] = { FRONT_LEFT, FRONT_RIGHT,
-                                             FRONT_CENTER, LFE,
-                                             SIDE_LEFT, SIDE_RIGHT };
-static const enum Channel X61Chans[] = { FRONT_LEFT, FRONT_LEFT,
-                                         FRONT_CENTER, LFE, BACK_CENTER,
-                                         SIDE_LEFT, SIDE_RIGHT };
-static const enum Channel X71Chans[] = { FRONT_LEFT, FRONT_RIGHT,
-                                         FRONT_CENTER, LFE,
-                                         BACK_LEFT, BACK_RIGHT,
-                                         SIDE_LEFT, SIDE_RIGHT };
-
-#define DECL_TEMPLATE(T, chans,N, func)                                       \
-static void Write_##T##_##chans(ALCdevice *device, T *RESTRICT buffer,        \
-                                ALuint SamplesToDo)                           \
+#define DECL_TEMPLATE(T, N, func)                                             \
+static void Write_##T##_##N(ALCdevice *device, T *RESTRICT buffer,            \
+                            ALuint SamplesToDo)                               \
 {                                                                             \
     ALfloat (*RESTRICT DryBuffer)[MAXCHANNELS] = device->DryBuffer;           \
-    const ALuint *ChanMap = device->DevChannels;                              \
+    const enum Channel *ChanMap = device->DevChannels;                        \
     ALuint i, j;                                                              \
                                                                               \
     for(i = 0;i < SamplesToDo;i++)                                            \
     {                                                                         \
         for(j = 0;j < N;j++)                                                  \
-            buffer[ChanMap[chans[j]]] = func(DryBuffer[i][chans[j]]);         \
-        buffer += N;                                                          \
+            *(buffer++) = func(DryBuffer[i][ChanMap[j]]);                     \
     }                                                                         \
 }
 
-DECL_TEMPLATE(ALfloat, MonoChans,1, aluF2F)
-DECL_TEMPLATE(ALfloat, QuadChans,4, aluF2F)
-DECL_TEMPLATE(ALfloat, X51Chans,6, aluF2F)
-DECL_TEMPLATE(ALfloat, X51SideChans,6, aluF2F)
-DECL_TEMPLATE(ALfloat, X61Chans,7, aluF2F)
-DECL_TEMPLATE(ALfloat, X71Chans,8, aluF2F)
-
-DECL_TEMPLATE(ALushort, MonoChans,1, aluF2US)
-DECL_TEMPLATE(ALushort, QuadChans,4, aluF2US)
-DECL_TEMPLATE(ALushort, X51Chans,6, aluF2US)
-DECL_TEMPLATE(ALushort, X51SideChans,6, aluF2US)
-DECL_TEMPLATE(ALushort, X61Chans,7, aluF2US)
-DECL_TEMPLATE(ALushort, X71Chans,8, aluF2US)
-
-DECL_TEMPLATE(ALshort, MonoChans,1, aluF2S)
-DECL_TEMPLATE(ALshort, QuadChans,4, aluF2S)
-DECL_TEMPLATE(ALshort, X51Chans,6, aluF2S)
-DECL_TEMPLATE(ALshort, X51SideChans,6, aluF2S)
-DECL_TEMPLATE(ALshort, X61Chans,7, aluF2S)
-DECL_TEMPLATE(ALshort, X71Chans,8, aluF2S)
-
-DECL_TEMPLATE(ALubyte, MonoChans,1, aluF2UB)
-DECL_TEMPLATE(ALubyte, QuadChans,4, aluF2UB)
-DECL_TEMPLATE(ALubyte, X51Chans,6, aluF2UB)
-DECL_TEMPLATE(ALubyte, X51SideChans,6, aluF2UB)
-DECL_TEMPLATE(ALubyte, X61Chans,7, aluF2UB)
-DECL_TEMPLATE(ALubyte, X71Chans,8, aluF2UB)
-
-DECL_TEMPLATE(ALbyte, MonoChans,1, aluF2B)
-DECL_TEMPLATE(ALbyte, QuadChans,4, aluF2B)
-DECL_TEMPLATE(ALbyte, X51Chans,6, aluF2B)
-DECL_TEMPLATE(ALbyte, X51SideChans,6, aluF2B)
-DECL_TEMPLATE(ALbyte, X61Chans,7, aluF2B)
-DECL_TEMPLATE(ALbyte, X71Chans,8, aluF2B)
+DECL_TEMPLATE(ALfloat, 1, aluF2F)
+DECL_TEMPLATE(ALfloat, 4, aluF2F)
+DECL_TEMPLATE(ALfloat, 6, aluF2F)
+DECL_TEMPLATE(ALfloat, 7, aluF2F)
+DECL_TEMPLATE(ALfloat, 8, aluF2F)
+
+DECL_TEMPLATE(ALushort, 1, aluF2US)
+DECL_TEMPLATE(ALushort, 4, aluF2US)
+DECL_TEMPLATE(ALushort, 6, aluF2US)
+DECL_TEMPLATE(ALushort, 7, aluF2US)
+DECL_TEMPLATE(ALushort, 8, aluF2US)
+
+DECL_TEMPLATE(ALshort, 1, aluF2S)
+DECL_TEMPLATE(ALshort, 4, aluF2S)
+DECL_TEMPLATE(ALshort, 6, aluF2S)
+DECL_TEMPLATE(ALshort, 7, aluF2S)
+DECL_TEMPLATE(ALshort, 8, aluF2S)
+
+DECL_TEMPLATE(ALubyte, 1, aluF2UB)
+DECL_TEMPLATE(ALubyte, 4, aluF2UB)
+DECL_TEMPLATE(ALubyte, 6, aluF2UB)
+DECL_TEMPLATE(ALubyte, 7, aluF2UB)
+DECL_TEMPLATE(ALubyte, 8, aluF2UB)
+
+DECL_TEMPLATE(ALbyte, 1, aluF2B)
+DECL_TEMPLATE(ALbyte, 4, aluF2B)
+DECL_TEMPLATE(ALbyte, 6, aluF2B)
+DECL_TEMPLATE(ALbyte, 7, aluF2B)
+DECL_TEMPLATE(ALbyte, 8, aluF2B)
 
 #undef DECL_TEMPLATE
 
-#define DECL_TEMPLATE(T, chans,N, func)                                       \
-static void Write_##T##_##chans(ALCdevice *device, T *RESTRICT buffer,        \
-                                ALuint SamplesToDo)                           \
+#define DECL_TEMPLATE(T, N, func)                                             \
+static void Write_##T##_##N(ALCdevice *device, T *RESTRICT buffer,            \
+                            ALuint SamplesToDo)                               \
 {                                                                             \
     ALfloat (*RESTRICT DryBuffer)[MAXCHANNELS] = device->DryBuffer;           \
-    const ALuint *ChanMap = device->DevChannels;                              \
+    const enum Channel *ChanMap = device->DevChannels;                        \
     ALuint i, j;                                                              \
                                                                               \
     if(device->Bs2b)                                                          \
@@ -927,12 +903,11 @@ static void Write_##T##_##chans(ALCdevice *device, T *RESTRICT buffer,        \
         for(i = 0;i < SamplesToDo;i++)                                        \
         {                                                                     \
             float samples[2];                                                 \
-            samples[0] = DryBuffer[i][chans[0]];                              \
-            samples[1] = DryBuffer[i][chans[1]];                              \
+            samples[0] = DryBuffer[i][ChanMap[0]];                            \
+            samples[1] = DryBuffer[i][ChanMap[1]];                            \
             bs2b_cross_feed(device->Bs2b, samples);                           \
-            buffer[ChanMap[chans[0]]]  = func(samples[0]);                    \
-            buffer[ChanMap[chans[1]]] = func(samples[1]);                     \
-            buffer += 2;                                                      \
+            *(buffer++) = func(samples[0]);                                   \
+            *(buffer++) = func(samples[1]);                                   \
         }                                                                     \
     }                                                                         \
     else                                                                      \
@@ -940,17 +915,16 @@ static void Write_##T##_##chans(ALCdevice *device, T *RESTRICT buffer,        \
         for(i = 0;i < SamplesToDo;i++)                                        \
         {                                                                     \
             for(j = 0;j < N;j++)                                              \
-                buffer[ChanMap[chans[j]]] = func(DryBuffer[i][chans[j]]);     \
-            buffer += N;                                                      \
+                *(buffer++) = func(DryBuffer[i][ChanMap[j]]);                 \
         }                                                                     \
     }                                                                         \
 }
 
-DECL_TEMPLATE(ALfloat, StereoChans,2, aluF2F)
-DECL_TEMPLATE(ALushort, StereoChans,2, aluF2US)
-DECL_TEMPLATE(ALshort, StereoChans,2, aluF2S)
-DECL_TEMPLATE(ALubyte, StereoChans,2, aluF2UB)
-DECL_TEMPLATE(ALbyte, StereoChans,2, aluF2B)
+DECL_TEMPLATE(ALfloat, 2, aluF2F)
+DECL_TEMPLATE(ALushort, 2, aluF2US)
+DECL_TEMPLATE(ALshort, 2, aluF2S)
+DECL_TEMPLATE(ALubyte, 2, aluF2UB)
+DECL_TEMPLATE(ALbyte, 2, aluF2B)
 
 #undef DECL_TEMPLATE
 
@@ -960,25 +934,23 @@ static void Write_##T(ALCdevice *device, T *buffer, ALuint SamplesToDo)       \
     switch(device->FmtChans)                                                  \
     {                                                                         \
         case DevFmtMono:                                                      \
-            Write_##T##_MonoChans(device, buffer, SamplesToDo);               \
+            Write_##T##_1(device, buffer, SamplesToDo);                       \
             break;                                                            \
         case DevFmtStereo:                                                    \
-            Write_##T##_StereoChans(device, buffer, SamplesToDo);             \
+            Write_##T##_2(device, buffer, SamplesToDo);                       \
             break;                                                            \
         case DevFmtQuad:                                                      \
-            Write_##T##_QuadChans(device, buffer, SamplesToDo);               \
+            Write_##T##_4(device, buffer, SamplesToDo);                       \
             break;                                                            \
         case DevFmtX51:                                                       \
-            Write_##T##_X51Chans(device, buffer, SamplesToDo);                \
-            break;                                                            \
         case DevFmtX51Side:                                                   \
-            Write_##T##_X51SideChans(device, buffer, SamplesToDo);            \
+            Write_##T##_6(device, buffer, SamplesToDo);                       \
             break;                                                            \
         case DevFmtX61:                                                       \
-            Write_##T##_X61Chans(device, buffer, SamplesToDo);                \
+            Write_##T##_7(device, buffer, SamplesToDo);                       \
             break;                                                            \
         case DevFmtX71:                                                       \
-            Write_##T##_X71Chans(device, buffer, SamplesToDo);                \
+            Write_##T##_8(device, buffer, SamplesToDo);                       \
             break;                                                            \
     }                                                                         \
 }
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index a577db52..412a3aa2 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -424,7 +424,7 @@ struct ALCdevice_struct
     // Dry path buffer mix
     ALfloat DryBuffer[BUFFERSIZE][MAXCHANNELS];
 
-    ALuint DevChannels[MAXCHANNELS];
+    enum Channel DevChannels[MAXCHANNELS];
 
     enum Channel Speaker2Chan[MAXCHANNELS];
     ALfloat PanningLUT[LUT_NUM][MAXCHANNELS];