From e516b3c0d317f2cceb5de6690705bfc6ff69f615 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 22 Dec 2007 14:00:10 -0800 Subject: Prevent possible buffer overflow in AL_PRINT --- OpenAL32/Include/alMain.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 71e29e47..1f62b535 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -82,7 +82,9 @@ extern char _alDebug[256]; if(!_al_print_fn) _al_print_fn = __FILE__; \ else _al_print_fn += 1; \ _al_print_i = snprintf(_alDebug, sizeof(_alDebug), "AL lib: %s:%d: ", _al_print_fn, __LINE__); \ - snprintf(_alDebug+_al_print_i, sizeof(_alDebug)-_al_print_i, __VA_ARGS__); \ + if(_al_print_i < (int)sizeof(_alDebug) && _al_print_i > 0) \ + snprintf(_alDebug+_al_print_i, sizeof(_alDebug)-_al_print_i, __VA_ARGS__); \ + _alDebug[sizeof(_alDebug)-1] = 0; \ fprintf(stderr, "%s", _alDebug); \ } while(0) -- cgit v1.2.3 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 --- Alc/ALu.c | 31 +++++++++++++++++++++++++++++-- OpenAL32/Include/alMain.h | 4 +++- OpenAL32/Include/alu.h | 2 +- OpenAL32/alExtension.c | 2 ++ 4 files changed, 35 insertions(+), 4 deletions(-) (limited to 'OpenAL32/Include') diff --git a/Alc/ALu.c b/Alc/ALu.c index 87764592..3e8ddd89 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -59,11 +59,13 @@ __inline ALuint aluBytesFromFormat(ALenum format) case AL_FORMAT_MONO8: case AL_FORMAT_STEREO8: case AL_FORMAT_QUAD8: + case AL_FORMAT_51CHN8: return 1; case AL_FORMAT_MONO16: case AL_FORMAT_STEREO16: case AL_FORMAT_QUAD16: + case AL_FORMAT_51CHN16: return 2; default: @@ -87,6 +89,10 @@ __inline ALuint aluChannelsFromFormat(ALenum format) case AL_FORMAT_QUAD16: return 4; + case AL_FORMAT_51CHN8: + case AL_FORMAT_51CHN16: + return 6; + default: return 0; } @@ -340,6 +346,9 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource, break; case AL_FORMAT_QUAD8: case AL_FORMAT_QUAD16: + /* TODO: Add center/lfe channel in spatial calculations? */ + case AL_FORMAT_51CHN8: + case AL_FORMAT_51CHN16: // Apply a scalar so each individual speaker has more weight PanningLR = 0.5f + (0.5f*Position[0]*1.41421356f); PanningLR = __min(1.0f, PanningLR); @@ -367,10 +376,14 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource, drysend[1] = SourceVolume * 1.0f * ListenerGain; drysend[2] = SourceVolume * 1.0f * ListenerGain; drysend[3] = SourceVolume * 1.0f * ListenerGain; + drysend[4] = SourceVolume * 1.0f * ListenerGain; + drysend[5] = SourceVolume * 1.0f * ListenerGain; wetsend[0] = SourceVolume * 0.0f * ListenerGain; wetsend[1] = SourceVolume * 0.0f * ListenerGain; wetsend[2] = SourceVolume * 0.0f * ListenerGain; wetsend[3] = SourceVolume * 0.0f * ListenerGain; + wetsend[4] = SourceVolume * 0.0f * ListenerGain; + wetsend[5] = SourceVolume * 0.0f * ListenerGain; pitch[0] = Pitch; } @@ -380,8 +393,8 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma { static float DryBuffer[BUFFERSIZE][OUTPUTCHANNELS]; static float WetBuffer[BUFFERSIZE][OUTPUTCHANNELS]; - ALfloat DrySend[OUTPUTCHANNELS] = { 0.0f, 0.0f, 0.0f, 0.0f }; - ALfloat WetSend[OUTPUTCHANNELS] = { 0.0f, 0.0f, 0.0f, 0.0f }; + ALfloat DrySend[OUTPUTCHANNELS] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; + ALfloat WetSend[OUTPUTCHANNELS] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; ALuint BlockAlign,BufferSize; ALuint DataSize=0,DataPosInt=0,DataPosFrac=0; ALuint Channels,Bits,Frequency,ulExtraSamples; @@ -641,6 +654,13 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma buffer = ((ALubyte*)buffer) + 1; } break; + case AL_FORMAT_51CHN8: + for(i = 0;i < SamplesToDo*6;i++) + { + *((ALubyte*)buffer) = (ALubyte)((aluF2S(DryBuffer[i/6][i%6]+WetBuffer[i/6][i%6])>>8)+128); + buffer = ((ALubyte*)buffer) + 1; + } + break; case AL_FORMAT_MONO16: for(i = 0;i < SamplesToDo;i++) { @@ -663,6 +683,13 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma buffer = ((ALshort*)buffer) + 1; } break; + case AL_FORMAT_51CHN16: + for(i = 0;i < SamplesToDo*6;i++) + { + *((ALshort*)buffer) = aluF2S(DryBuffer[i/6][i%6]+WetBuffer[i/6][i%6]); + buffer = ((ALshort*)buffer) + 1; + } + break; } size -= SamplesToDo; 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< Date: Fri, 28 Dec 2007 22:41:14 -0800 Subject: Implement AL_EXT_FLOAT32 --- Alc/ALc.c | 2 +- Alc/ALu.c | 6 ++++++ OpenAL32/Include/alMain.h | 3 +++ OpenAL32/alBuffer.c | 28 ++++++++++++++++++++++++++++ OpenAL32/alSource.c | 9 +++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) (limited to 'OpenAL32/Include') diff --git a/Alc/ALc.c b/Alc/ALc.c index 8c75b32c..0db68efe 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -357,7 +357,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_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_OFFSET"); + strcpy(pContext->ExtensionList, "AL_EXT_EXPONENT_DISTANCE AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_OFFSET"); } diff --git a/Alc/ALu.c b/Alc/ALu.c index b5af500b..f77990a7 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -68,6 +68,10 @@ __inline ALuint aluBytesFromFormat(ALenum format) case AL_FORMAT_51CHN16: return 2; + case AL_FORMAT_MONO_FLOAT32: + case AL_FORMAT_STEREO_FLOAT32: + return 4; + default: return 0; } @@ -79,10 +83,12 @@ __inline ALuint aluChannelsFromFormat(ALenum format) { case AL_FORMAT_MONO8: case AL_FORMAT_MONO16: + case AL_FORMAT_MONO_FLOAT32: return 1; case AL_FORMAT_STEREO8: case AL_FORMAT_STEREO16: + case AL_FORMAT_STEREO_FLOAT32: return 2; case AL_FORMAT_QUAD8: diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 30dd068f..f11f8fd9 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -89,6 +89,9 @@ extern char _alDebug[256]; } while(0) +#define AL_FORMAT_MONO_FLOAT32 0x10010 +#define AL_FORMAT_STEREO_FLOAT32 0x10011 + #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 diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index ab5b60d8..d1a8c359 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -282,6 +282,10 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d LoadData(ALBuf, data, size, freq, format, AL_FORMAT_MONO16); break; + case AL_FORMAT_MONO_FLOAT32: + LoadData(ALBuf, data, size, freq, format, AL_FORMAT_MONO16); + break; + case AL_FORMAT_STEREO8: LoadData(ALBuf, data, size, freq, format, AL_FORMAT_STEREO16); break; @@ -290,6 +294,10 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d LoadData(ALBuf, data, size, freq, format, AL_FORMAT_STEREO16); break; + case AL_FORMAT_STEREO_FLOAT32: + LoadData(ALBuf, data, size, freq, format, AL_FORMAT_STEREO16); + break; + case AL_FORMAT_MONO_IMA4: // Here is where things vary: // nVidia and Apple use 64+1 samples per block => block_size=36 bytes @@ -913,6 +921,26 @@ static void LoadData(ALbuffer *ALBuf, const ALubyte *data, ALsizei size, ALuint alSetError(AL_OUT_OF_MEMORY); break; + case 4: + size /= sizeof(ALfloat); + + // Allocate 8 extra samples + ALBuf->data = realloc(ALBuf->data, (8*NewChannels + size) * (1*sizeof(ALshort))); + if (ALBuf->data) + { + for (i = 0;i < size;i++) + ALBuf->data[i] = (ALshort)(((ALfloat*)data)[i] * 32767.5f - 0.5); + memset(&(ALBuf->data[size]), 0, 16*NewChannels); + + ALBuf->format = NewFormat; + ALBuf->eOriginalFormat = OrigFormat; + ALBuf->size = size*1*sizeof(ALshort); + ALBuf->frequency = freq; + } + else + alSetError(AL_OUT_OF_MEMORY); + break; + default: assert(0); } diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index a06c6060..7c022e6c 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -1910,6 +1910,10 @@ static ALboolean GetSourceOffset(ALsource *pSource, ALenum eName, ALfloat *pflOf { *pflOffset = (ALfloat)(lBytesPlayed >> 1); } + else if (aluBytesFromFormat(eOriginalFormat) == 4) + { + *pflOffset = (ALfloat)(lBytesPlayed << 1); + } else if ((eOriginalFormat == AL_FORMAT_MONO_IMA4) || (eOriginalFormat == AL_FORMAT_STEREO_IMA4)) { @@ -2061,6 +2065,11 @@ static ALint GetByteOffset(ALsource *pSource) lByteOffset = pSource->lOffset * 2; lByteOffset -= (lByteOffset % (lChannels * 2)); } + else if (aluBytesFromFormat(pBuffer->eOriginalFormat) == 4) + { + lByteOffset = pSource->lOffset / 2; + lByteOffset -= (lByteOffset % (lChannels * 2)); + } else if ((pBuffer->eOriginalFormat == AL_FORMAT_MONO_IMA4) || (pBuffer->eOriginalFormat == AL_FORMAT_STEREO_IMA4)) { -- cgit v1.2.3 From 1e0fa58d79d046ec244289ff8dc59ec188051d21 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 00:52:34 -0800 Subject: Remove unused macros --- OpenAL32/Include/alMain.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index f11f8fd9..c6738868 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -1,9 +1,6 @@ #ifndef AL_MAIN_H #define AL_MAIN_H -#define AL_MAX_CHANNELS 4 -#define AL_MAX_SOURCES 32 - #include #include "alu.h" @@ -102,7 +99,6 @@ extern char _alDebug[256]; #define AL_FORMAT_51CHN16 0x120B #define SWMIXER_OUTPUT_RATE 44100 -//#define OUTPUT_BUFFER_SIZE (32768*SWMIXER_OUTPUT_RATE/22050) #define SPEEDOFSOUNDMETRESPERSEC (343.3f) -- cgit v1.2.3 From f32098e04d7533782e66f8a06641703383b627b3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 01:09:21 -0800 Subject: Don't append _struct to the source struct name --- OpenAL32/Include/alSource.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 499ddcf4..5edbfd1e 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -17,7 +17,7 @@ typedef struct ALbufferlistitem struct ALbufferlistitem *next; } ALbufferlistitem; -typedef struct ALsource_struct +typedef struct ALsource { ALfloat flPitch; ALfloat flGain; @@ -61,7 +61,7 @@ typedef struct ALsource_struct // Source Type (Static, Streaming, or Undetermined) ALint lSourceType; - struct ALsource_struct *next; + struct ALsource *next; } ALsource; #ifdef __cplusplus -- cgit v1.2.3 From e82c27ab0402fae11811a34b5b44ba4462f35f4e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 01:09:57 -0800 Subject: Fix includes so alMain.h doesn't include so much by itself --- Alc/ALc.c | 3 +++ Alc/ALu.c | 4 ++++ OpenAL32/Include/alMain.h | 10 ++-------- OpenAL32/alBuffer.c | 1 + OpenAL32/alSource.c | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) (limited to 'OpenAL32/Include') diff --git a/Alc/ALc.c b/Alc/ALc.c index 0db68efe..376a3ce8 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -29,6 +29,9 @@ #include "alMain.h" #include "AL/al.h" #include "AL/alc.h" +#include "alThunk.h" +#include "alSource.h" +#include "alExtension.h" /////////////////////////////////////////////////////// // DEBUG INFORMATION diff --git a/Alc/ALu.c b/Alc/ALu.c index f3cd24f5..b19bd518 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -26,6 +26,10 @@ #include "alMain.h" #include "AL/al.h" #include "AL/alc.h" +#include "alSource.h" +#include "alBuffer.h" +#include "alThunk.h" +#include "alListener.h" #if defined(HAVE_STDINT_H) #include diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index c6738868..f2beb30f 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -56,13 +56,7 @@ static inline void DeleteCriticalSection(CRITICAL_SECTION *cs) #define max(x,y) (((x)>(y))?(x):(y)) #endif -#include "alBuffer.h" -#include "alError.h" -#include "alExtension.h" #include "alListener.h" -#include "alSource.h" -#include "alState.h" -#include "alThunk.h" #ifdef __cplusplus extern "C" @@ -156,8 +150,8 @@ struct ALCcontext_struct { ALlistener Listener; - ALsource *Source; - ALuint SourceCount; + struct ALsource *Source; + ALuint SourceCount; ALenum LastError; ALboolean InUse; diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index 33db7cfb..13b98b21 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -27,6 +27,7 @@ #include "AL/alc.h" #include "alError.h" #include "alBuffer.h" +#include "alThunk.h" static void LoadData(ALbuffer *ALBuf, const ALubyte *data, ALsizei size, ALuint freq, ALenum OrigFormat, ALenum NewFormat); diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 7c022e6c..44cd8b41 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -26,6 +26,8 @@ #include "AL/alc.h" #include "alError.h" #include "alSource.h" +#include "alBuffer.h" +#include "alThunk.h" static ALvoid InitSourceParams(ALsource *pSource); static ALboolean GetSourceOffset(ALsource *pSource, ALenum eName, ALfloat *pflOffset); -- cgit v1.2.3 From 7a99b1fa32341460eb3144e860e6bd23467ae919 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 01:16:13 -0800 Subject: Make some defines local to ALu.c --- Alc/ALu.c | 6 ++++++ OpenAL32/Include/alu.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenAL32/Include') diff --git a/Alc/ALu.c b/Alc/ALu.c index b19bd518..bb2bbd0a 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -56,6 +56,12 @@ typedef long long ALint64; #define __min min #endif +#define BUFFERSIZE 48000 +#define FRACTIONBITS 14 +#define FRACTIONMASK ((1L< 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/Include') 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 9382956b0ec459a696805a23656a9e94b6ed94d9 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 31 Dec 2007 06:00:50 -0800 Subject: Remove obsolete comment --- OpenAL32/Include/alMain.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 08f0a9ff..3449b57e 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -86,8 +86,6 @@ 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 some of the extra formats #define AL_FORMAT_51CHN8 0x120A #define AL_FORMAT_51CHN16 0x120B #define AL_FORMAT_51CHN32 0x120C -- cgit v1.2.3