diff options
| author | Chris Robinson <[email protected]> | 2007-12-26 23:01:22 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2007-12-26 23:01:22 -0800 |
| commit | ab8d342df06fdfcc1b630e318e121bcfb6a1cdfa (patch) | |
| tree | 008d2c40263ff43ac361fece98e99384d3ba9246 /OpenAL32 | |
| parent | dcac0de44ce1856fea0ff2d8d71feb2346aa911c (diff) | |
Allow 5.1 channel output
This doesn't use the center or LFE channel in spatial calculations, however
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alExtension.c | 2 |
3 files changed, 6 insertions, 2 deletions
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 }, |