From ab8d342df06fdfcc1b630e318e121bcfb6a1cdfa Mon Sep 17 00:00:00 2001 From: Chris Robinson 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/alExtension.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenAL32/alExtension.c') 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 From 76dd568971fcefb4a1aee523dc02c83fe5950bf4 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 02:53:56 -0800 Subject: Add some more formats --- OpenAL32/Include/alMain.h | 18 +++++++++++++++--- OpenAL32/alExtension.c | 11 +++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) (limited to 'OpenAL32/alExtension.c') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index f2beb30f..08f0a9ff 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -85,12 +85,24 @@ 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 the extra formats -#define AL_FORMAT_QUAD8 0x1204 -#define AL_FORMAT_QUAD16 0x1205 +// can use some of the extra formats #define AL_FORMAT_51CHN8 0x120A #define AL_FORMAT_51CHN16 0x120B +#define AL_FORMAT_51CHN32 0x120C +#define AL_FORMAT_61CHN8 0x120D +#define AL_FORMAT_61CHN16 0x120E +#define AL_FORMAT_61CHN32 0x120F +#define AL_FORMAT_71CHN8 0x1210 +#define AL_FORMAT_71CHN16 0x1211 +#define AL_FORMAT_71CHN32 0x1212 +#define AL_FORMAT_QUAD8 0x1204 +#define AL_FORMAT_QUAD16 0x1205 +#define AL_FORMAT_QUAD32 0x1206 +#define AL_FORMAT_REAR8 0x1207 +#define AL_FORMAT_REAR16 0x1208 +#define AL_FORMAT_REAR32 0x1209 #define SWMIXER_OUTPUT_RATE 44100 diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c index 24ea48db..a48eba9f 100644 --- a/OpenAL32/alExtension.c +++ b/OpenAL32/alExtension.c @@ -156,8 +156,19 @@ 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_QUAD32", AL_FORMAT_QUAD32 }, { (ALchar *)"AL_FORMAT_51CHN8", AL_FORMAT_51CHN8 }, { (ALchar *)"AL_FORMAT_51CHN16", AL_FORMAT_51CHN16 }, + { (ALchar *)"AL_FORMAT_51CHN32", AL_FORMAT_51CHN32 }, + { (ALchar *)"AL_FORMAT_61CHN8", AL_FORMAT_61CHN8 }, + { (ALchar *)"AL_FORMAT_61CHN16", AL_FORMAT_61CHN16 }, + { (ALchar *)"AL_FORMAT_61CHN32", AL_FORMAT_61CHN32 }, + { (ALchar *)"AL_FORMAT_71CHN8", AL_FORMAT_71CHN8 }, + { (ALchar *)"AL_FORMAT_71CHN16", AL_FORMAT_71CHN16 }, + { (ALchar *)"AL_FORMAT_71CHN32", AL_FORMAT_71CHN32 }, + { (ALchar *)"AL_FORMAT_REAR8", AL_FORMAT_REAR8 }, + { (ALchar *)"AL_FORMAT_REAR16", AL_FORMAT_REAR16 }, + { (ALchar *)"AL_FORMAT_REAR32", AL_FORMAT_REAR32 }, // Buffer attributes { (ALchar *)"AL_FREQUENCY", AL_FREQUENCY }, -- cgit v1.2.3 From 1c852736620d97e2ce5be27479167046074c347e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 02:55:35 -0800 Subject: Export float32 formats --- OpenAL32/alExtension.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenAL32/alExtension.c') diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c index a48eba9f..82ee3f62 100644 --- a/OpenAL32/alExtension.c +++ b/OpenAL32/alExtension.c @@ -150,8 +150,10 @@ static ALenums enumeration[]={ // Buffer Formats { (ALchar *)"AL_FORMAT_MONO8", AL_FORMAT_MONO8 }, { (ALchar *)"AL_FORMAT_MONO16", AL_FORMAT_MONO16 }, + { (ALchar *)"AL_FORMAT_MONO_FLOAT32", AL_FORMAT_MONO_FLOAT32 }, { (ALchar *)"AL_FORMAT_STEREO8", AL_FORMAT_STEREO8 }, { (ALchar *)"AL_FORMAT_STEREO16", AL_FORMAT_STEREO16 }, + { (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", AL_FORMAT_QUAD8 }, -- cgit v1.2.3