Add support for AL_LOKI_quadriphonic

5 files changed, 12 insertions, 1 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 3ae5c902..b49cc49f 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -382,7 +382,7 @@ static ALvoid InitContext(ALCcontext *pContext)
     pContext->lNumStereoSources = 1;
     pContext->lNumMonoSources = pContext->Device->MaxNoOfSources - pContext->lNumStereoSources;
 
-    strcpy(pContext->ExtensionList, "AL_EXT_EXPONENT_DISTANCE AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS AL_EXT_OFFSET");
+    strcpy(pContext->ExtensionList, "AL_EXT_EXPONENT_DISTANCE AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS AL_EXT_OFFSET AL_LOKI_quadriphonic");
 
     level = GetConfigValueInt(NULL, "cf_level", 0);
     if(level > 0 && level <= 6)
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 8e60a545..3b9e0611 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -83,6 +83,7 @@ __inline ALuint aluBytesFromFormat(ALenum format)
     {
         case AL_FORMAT_MONO8:
         case AL_FORMAT_STEREO8:
+        case AL_FORMAT_QUAD8_LOKI:
         case AL_FORMAT_QUAD8:
         case AL_FORMAT_51CHN8:
         case AL_FORMAT_61CHN8:
@@ -91,6 +92,7 @@ __inline ALuint aluBytesFromFormat(ALenum format)
 
         case AL_FORMAT_MONO16:
         case AL_FORMAT_STEREO16:
+        case AL_FORMAT_QUAD16_LOKI:
         case AL_FORMAT_QUAD16:
         case AL_FORMAT_51CHN16:
         case AL_FORMAT_61CHN16:
@@ -124,6 +126,8 @@ __inline ALuint aluChannelsFromFormat(ALenum format)
         case AL_FORMAT_STEREO_FLOAT32:
             return 2;
 
+        case AL_FORMAT_QUAD8_LOKI:
+        case AL_FORMAT_QUAD16_LOKI:
         case AL_FORMAT_QUAD8:
         case AL_FORMAT_QUAD16:
         case AL_FORMAT_QUAD32:
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 5dd74eea..b815530c 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -114,6 +114,9 @@ extern char _alDebug[256];
 #define AL_FORMAT_MONO_IMA4                      0x1300
 #define AL_FORMAT_STEREO_IMA4                    0x1301
 
+#define AL_FORMAT_QUAD8_LOKI                     0x10004
+#define AL_FORMAT_QUAD16_LOKI                    0x10005
+
 #define AL_FORMAT_51CHN8                         0x120A
 #define AL_FORMAT_51CHN16                        0x120B
 #define AL_FORMAT_51CHN32                        0x120C
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 1ea54fce..f9017caa 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -392,6 +392,8 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d
                     }
                 }   break;
 
+                case AL_FORMAT_QUAD8_LOKI:
+                case AL_FORMAT_QUAD16_LOKI:
                 case AL_FORMAT_QUAD8:
                 case AL_FORMAT_QUAD16:
                 case AL_FORMAT_QUAD32:
diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c
index fff46d0a..703bd140 100644
--- a/OpenAL32/alExtension.c
+++ b/OpenAL32/alExtension.c
@@ -209,6 +209,8 @@ static ALenums enumeration[]={
     { (ALchar *)"AL_FORMAT_STEREO_FLOAT32",             AL_FORMAT_STEREO_FLOAT32            },
     { (ALchar *)"AL_FORMAT_MONO_IMA4",                  AL_FORMAT_MONO_IMA4                 },
     { (ALchar *)"AL_FORMAT_STEREO_IMA4",                AL_FORMAT_STEREO_IMA4               },
+    { (ALchar *)"AL_FORMAT_QUAD8_LOKI",                 AL_FORMAT_QUAD8_LOKI                },
+    { (ALchar *)"AL_FORMAT_QUAD16_LOKI",                AL_FORMAT_QUAD16_LOKI               },
     { (ALchar *)"AL_FORMAT_QUAD8",                      AL_FORMAT_QUAD8                     },
     { (ALchar *)"AL_FORMAT_QUAD16",                     AL_FORMAT_QUAD16                    },
     { (ALchar *)"AL_FORMAT_QUAD32",                     AL_FORMAT_QUAD32                    },