Move default channel order setting out of the header

1 files changed, 79 insertions, 0 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 970b98c9..383e2c47 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1537,6 +1537,85 @@ ALCboolean ALCAPIENTRY alcMakeCurrent(ALCcontext *context)
 }
 
 
+// Sets the default channel order used by most non-WaveFormatEx-based APIs
+void SetDefaultChannelOrder(ALCdevice *device)
+{
+    switch(aluChannelsFromFormat(device->Format))
+    {
+    case 1: /* Mono is rendered as stereo; fall-through... */
+    case 2: device->DevChannels[0] = FRONT_LEFT;
+            device->DevChannels[1] = FRONT_RIGHT; break;
+
+    case 4: device->DevChannels[0] = FRONT_LEFT;
+            device->DevChannels[1] = FRONT_RIGHT;
+            device->DevChannels[2] = BACK_LEFT;
+            device->DevChannels[3] = BACK_RIGHT; break;
+
+    case 6: 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; break;
+
+    case 7: 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 8: 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; break;
+    }
+}
+// Sets the default order used by WaveFormatEx
+void SetDefaultWFXChannelOrder(ALCdevice *device)
+{
+    switch(aluChannelsFromFormat(device->Format))
+    {
+    case 1: /* Mono is rendered as stereo; fall-through... */
+    case 2: device->DevChannels[0] = FRONT_LEFT;
+            device->DevChannels[1] = FRONT_RIGHT; break;
+
+    case 4: device->DevChannels[0] = FRONT_LEFT;
+            device->DevChannels[1] = FRONT_RIGHT;
+            device->DevChannels[2] = BACK_LEFT;
+            device->DevChannels[3] = BACK_RIGHT; break;
+
+    case 6: 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 7: 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 8: 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;
+    }
+}
+
 static ALenum GetFormatFromString(const char *str)
 {
     if(strcasecmp(str, "AL_FORMAT_MONO32") == 0)    return AL_FORMAT_MONO_FLOAT32;