From ab8d342df06fdfcc1b630e318e121bcfb6a1cdfa Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 26 Dec 2007 23:01:22 -0800
Subject: Allow 5.1 channel output This doesn't use the center or LFE channel
 in spatial calculations, however

---
 OpenAL32/Include/alMain.h | 4 +++-
 OpenAL32/Include/alu.h    | 2 +-
 OpenAL32/alExtension.c    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenAL32')

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 1f62b535..30dd068f 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -92,9 +92,11 @@ extern char _alDebug[256];
 #define AL_FORMAT_MONO_IMA4                      0x1300
 #define AL_FORMAT_STEREO_IMA4                    0x1301
 // These are from AL_EXT_MCFORMATS, which we don't support yet but the mixer
-// can use 4-channel formats
+// can use the extra formats
 #define AL_FORMAT_QUAD8                          0x1204
 #define AL_FORMAT_QUAD16                         0x1205
+#define AL_FORMAT_51CHN8                         0x120A
+#define AL_FORMAT_51CHN16                        0x120B
 
 #define SWMIXER_OUTPUT_RATE        44100
 //#define OUTPUT_BUFFER_SIZE         (32768*SWMIXER_OUTPUT_RATE/22050)
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index e4fe0dc3..ecf32e5c 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -5,7 +5,7 @@
 #define FRACTIONBITS 14
 #define FRACTIONMASK ((1L<<FRACTIONBITS)-1)
 #define MAX_PITCH 4
-#define OUTPUTCHANNELS 4
+#define OUTPUTCHANNELS 6
 
 #include "AL/al.h"
 #include "AL/alc.h"
diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c
index 269590e9..24ea48db 100644
--- a/OpenAL32/alExtension.c
+++ b/OpenAL32/alExtension.c
@@ -156,6 +156,8 @@ static ALenums enumeration[]={
     { (ALchar *)"AL_FORMAT_STEREO_IMA4",                AL_FORMAT_STEREO_IMA4               },
     { (ALchar *)"AL_FORMAT_QUAD8",                      AL_FORMAT_QUAD8                     },
     { (ALchar *)"AL_FORMAT_QUAD16",                     AL_FORMAT_QUAD16                    },
+    { (ALchar *)"AL_FORMAT_51CHN8",                     AL_FORMAT_51CHN8                    },
+    { (ALchar *)"AL_FORMAT_51CHN16",                    AL_FORMAT_51CHN16                   },
 
     // Buffer attributes
     { (ALchar *)"AL_FREQUENCY",                         AL_FREQUENCY                        },
-- 
cgit v1.2.3