aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <chris.kcat@gmail.com>2012-01-10 00:41:05 -0800
committerChris Robinson <chris.kcat@gmail.com>2012-01-10 00:41:05 -0800
commit61af4d715c8a3d9568be8ef8dab1d765c11d8dc0 (patch)
treedfbf5aebb0e17bb1837332dc9860e656af6b6c69
parent535091e36c994b9c9363728cfa348f70ba545811 (diff)
Append _SOFT to the AL_SOFT_buffer_samples enums
-rw-r--r--OpenAL32/Include/alBuffer.h40
-rw-r--r--OpenAL32/Include/alMain.h90
-rw-r--r--OpenAL32/alBuffer.c98
-rw-r--r--OpenAL32/alExtension.c90
4 files changed, 159 insertions, 159 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h
index cacaa716..6802ab7b 100644
--- a/OpenAL32/Include/alBuffer.h
+++ b/OpenAL32/Include/alBuffer.h
@@ -9,28 +9,28 @@ extern "C" {
/* User formats */
enum UserFmtType {
- UserFmtByte = AL_BYTE,
- UserFmtUByte = AL_UNSIGNED_BYTE,
- UserFmtShort = AL_SHORT,
- UserFmtUShort = AL_UNSIGNED_SHORT,
- UserFmtInt = AL_INT,
- UserFmtUInt = AL_UNSIGNED_INT,
- UserFmtFloat = AL_FLOAT,
- UserFmtDouble = AL_DOUBLE,
- UserFmtMulaw = AL_MULAW,
- UserFmtAlaw = AL_ALAW,
- UserFmtIMA4 = AL_IMA4,
- UserFmtByte3 = AL_BYTE3,
- UserFmtUByte3 = AL_UNSIGNED_BYTE3,
+ UserFmtByte = AL_BYTE_SOFT,
+ UserFmtUByte = AL_UNSIGNED_BYTE_SOFT,
+ UserFmtShort = AL_SHORT_SOFT,
+ UserFmtUShort = AL_UNSIGNED_SHORT_SOFT,
+ UserFmtInt = AL_INT_SOFT,
+ UserFmtUInt = AL_UNSIGNED_INT_SOFT,
+ UserFmtFloat = AL_FLOAT_SOFT,
+ UserFmtDouble = AL_DOUBLE_SOFT,
+ UserFmtByte3 = AL_BYTE3_SOFT,
+ UserFmtUByte3 = AL_UNSIGNED_BYTE3_SOFT,
+ UserFmtMulaw = AL_MULAW_SOFT,
+ UserFmtAlaw = AL_ALAW_SOFT,
+ UserFmtIMA4 = AL_IMA4_SOFT,
};
enum UserFmtChannels {
- UserFmtMono = AL_MONO,
- UserFmtStereo = AL_STEREO,
- UserFmtRear = AL_REAR,
- UserFmtQuad = AL_QUAD,
- UserFmtX51 = AL_5POINT1, /* (WFX order) */
- UserFmtX61 = AL_6POINT1, /* (WFX order) */
- UserFmtX71 = AL_7POINT1 /* (WFX order) */
+ UserFmtMono = AL_MONO_SOFT,
+ UserFmtStereo = AL_STEREO_SOFT,
+ UserFmtRear = AL_REAR_SOFT,
+ UserFmtQuad = AL_QUAD_SOFT,
+ UserFmtX51 = AL_5POINT1_SOFT, /* (WFX order) */
+ UserFmtX61 = AL_6POINT1_SOFT, /* (WFX order) */
+ UserFmtX71 = AL_7POINT1_SOFT, /* (WFX order) */
};
ALuint BytesFromUserFmt(enum UserFmtType type);
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 3cc82617..27951e90 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -52,57 +52,57 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe
#ifndef AL_SOFT_buffer_samples
#define AL_SOFT_buffer_samples 1
/* Sample types */
-#define AL_BYTE 0x1400
-#define AL_UNSIGNED_BYTE 0x1401
-#define AL_SHORT 0x1402
-#define AL_UNSIGNED_SHORT 0x1403
-#define AL_INT 0x1404
-#define AL_UNSIGNED_INT 0x1405
-#define AL_FLOAT 0x1406
-#define AL_DOUBLE 0x1407
-#define AL_BYTE3 0x1408
-#define AL_UNSIGNED_BYTE3 0x1409
-#define AL_MULAW 0x1410
-#define AL_ALAW 0x1411
-#define AL_IMA4 0x1412
+#define AL_BYTE_SOFT 0x1400
+#define AL_UNSIGNED_BYTE_SOFT 0x1401
+#define AL_SHORT_SOFT 0x1402
+#define AL_UNSIGNED_SHORT_SOFT 0x1403
+#define AL_INT_SOFT 0x1404
+#define AL_UNSIGNED_INT_SOFT 0x1405
+#define AL_FLOAT_SOFT 0x1406
+#define AL_DOUBLE_SOFT 0x1407
+#define AL_BYTE3_SOFT 0x1408
+#define AL_UNSIGNED_BYTE3_SOFT 0x1409
+#define AL_MULAW_SOFT 0x1410
+#define AL_ALAW_SOFT 0x1411
+#define AL_IMA4_SOFT 0x1412
/* Channel configurations */
-#define AL_MONO 0x1500
-#define AL_STEREO 0x1501
-#define AL_REAR 0x1502
-#define AL_QUAD 0x1503
-#define AL_5POINT1 0x1504 /* (WFX order) */
-#define AL_6POINT1 0x1505 /* (WFX order) */
-#define AL_7POINT1 0x1506 /* (WFX order) */
+#define AL_MONO_SOFT 0x1500
+#define AL_STEREO_SOFT 0x1501
+#define AL_REAR_SOFT 0x1502
+#define AL_QUAD_SOFT 0x1503
+#define AL_5POINT1_SOFT 0x1504
+#define AL_6POINT1_SOFT 0x1505
+#define AL_7POINT1_SOFT 0x1506
/* Storage formats */
-#define AL_MONO8 0x1100
-#define AL_MONO16 0x1101
-#define AL_MONO32F 0x10010
-#define AL_STEREO8 0x1102
-#define AL_STEREO16 0x1103
-#define AL_STEREO32F 0x10011
-#define AL_QUAD8 0x1204
-#define AL_QUAD16 0x1205
-#define AL_QUAD32F 0x1206
-#define AL_REAR8 0x1207
-#define AL_REAR16 0x1208
-#define AL_REAR32F 0x1209
-#define AL_5POINT1_8 0x120A
-#define AL_5POINT1_16 0x120B
-#define AL_5POINT1_32F 0x120C
-#define AL_6POINT1_8 0x120D
-#define AL_6POINT1_16 0x120E
-#define AL_6POINT1_32F 0x120F
-#define AL_7POINT1_8 0x1210
-#define AL_7POINT1_16 0x1211
-#define AL_7POINT1_32F 0x1212
+#define AL_MONO8_SOFT 0x1100
+#define AL_MONO16_SOFT 0x1101
+#define AL_MONO32F_SOFT 0x10010
+#define AL_STEREO8_SOFT 0x1102
+#define AL_STEREO16_SOFT 0x1103
+#define AL_STEREO32F_SOFT 0x10011
+#define AL_QUAD8_SOFT 0x1204
+#define AL_QUAD16_SOFT 0x1205
+#define AL_QUAD32F_SOFT 0x1206
+#define AL_REAR8_SOFT 0x1207
+#define AL_REAR16_SOFT 0x1208
+#define AL_REAR32F_SOFT 0x1209
+#define AL_5POINT1_8_SOFT 0x120A
+#define AL_5POINT1_16_SOFT 0x120B
+#define AL_5POINT1_32F_SOFT 0x120C
+#define AL_6POINT1_8_SOFT 0x120D
+#define AL_6POINT1_16_SOFT 0x120E
+#define AL_6POINT1_32F_SOFT 0x120F
+#define AL_7POINT1_8_SOFT 0x1210
+#define AL_7POINT1_16_SOFT 0x1211
+#define AL_7POINT1_32F_SOFT 0x1212
/* Buffer attributes */
-#define AL_INTERNAL_FORMAT 0x2008
-#define AL_BYTE_LENGTH 0x2009
-#define AL_SAMPLE_LENGTH 0x200A
-#define AL_SEC_LENGTH 0x200B
+#define AL_INTERNAL_FORMAT_SOFT 0x2008
+#define AL_BYTE_LENGTH_SOFT 0x2009
+#define AL_SAMPLE_LENGTH_SOFT 0x200A
+#define AL_SEC_LENGTH_SOFT 0x200B
typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 083a2fc1..446c6e4e 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -839,7 +839,7 @@ AL_API ALvoid AL_APIENTRY alGetBufferf(ALuint buffer, ALenum eParam, ALfloat *pf
{
switch(eParam)
{
- case AL_SEC_LENGTH:
+ case AL_SEC_LENGTH_SOFT:
ReadLock(&pBuffer->lock);
if(pBuffer->SampleLen != 0)
*pflValue = pBuffer->SampleLen / (ALfloat)pBuffer->Frequency;
@@ -892,7 +892,7 @@ AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum eParam, ALfloat* pfl
switch(eParam)
{
- case AL_SEC_LENGTH:
+ case AL_SEC_LENGTH_SOFT:
alGetBufferf(buffer, eParam, pflValues);
return;
}
@@ -956,15 +956,15 @@ AL_API ALvoid AL_APIENTRY alGetBufferi(ALuint buffer, ALenum eParam, ALint *plVa
ReadUnlock(&pBuffer->lock);
break;
- case AL_INTERNAL_FORMAT:
+ case AL_INTERNAL_FORMAT_SOFT:
*plValue = pBuffer->Format;
break;
- case AL_BYTE_LENGTH:
+ case AL_BYTE_LENGTH_SOFT:
*plValue = pBuffer->OriginalSize;
break;
- case AL_SAMPLE_LENGTH:
+ case AL_SAMPLE_LENGTH_SOFT:
*plValue = pBuffer->SampleLen;
break;
@@ -1017,9 +1017,9 @@ AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plVal
case AL_BITS:
case AL_CHANNELS:
case AL_SIZE:
- case AL_INTERNAL_FORMAT:
- case AL_BYTE_LENGTH:
- case AL_SAMPLE_LENGTH:
+ case AL_INTERNAL_FORMAT_SOFT:
+ case AL_BYTE_LENGTH_SOFT:
+ case AL_SAMPLE_LENGTH_SOFT:
alGetBufferi(buffer, eParam, plValues);
return;
}
@@ -2209,36 +2209,36 @@ static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum Fm
enum FmtChannels channels;
enum FmtType type;
} list[] = {
- { AL_MONO8, FmtMono, FmtByte },
- { AL_MONO16, FmtMono, FmtShort },
- { AL_MONO32F, FmtMono, FmtFloat },
+ { AL_MONO8_SOFT, FmtMono, FmtByte },
+ { AL_MONO16_SOFT, FmtMono, FmtShort },
+ { AL_MONO32F_SOFT, FmtMono, FmtFloat },
- { AL_STEREO8, FmtStereo, FmtByte },
- { AL_STEREO16, FmtStereo, FmtShort },
- { AL_STEREO32F, FmtStereo, FmtFloat },
+ { AL_STEREO8_SOFT, FmtStereo, FmtByte },
+ { AL_STEREO16_SOFT, FmtStereo, FmtShort },
+ { AL_STEREO32F_SOFT, FmtStereo, FmtFloat },
- { AL_REAR8, FmtRear, FmtByte },
- { AL_REAR16, FmtRear, FmtShort },
- { AL_REAR32F, FmtRear, FmtFloat },
+ { AL_REAR8_SOFT, FmtRear, FmtByte },
+ { AL_REAR16_SOFT, FmtRear, FmtShort },
+ { AL_REAR32F_SOFT, FmtRear, FmtFloat },
{ AL_FORMAT_QUAD8_LOKI, FmtQuad, FmtByte },
{ AL_FORMAT_QUAD16_LOKI, FmtQuad, FmtShort },
- { AL_QUAD8, FmtQuad, FmtByte },
- { AL_QUAD16, FmtQuad, FmtShort },
- { AL_QUAD32F, FmtQuad, FmtFloat },
+ { AL_QUAD8_SOFT, FmtQuad, FmtByte },
+ { AL_QUAD16_SOFT, FmtQuad, FmtShort },
+ { AL_QUAD32F_SOFT, FmtQuad, FmtFloat },
- { AL_5POINT1_8, FmtX51, FmtByte },
- { AL_5POINT1_16, FmtX51, FmtShort },
- { AL_5POINT1_32F, FmtX51, FmtFloat },
+ { AL_5POINT1_8_SOFT, FmtX51, FmtByte },
+ { AL_5POINT1_16_SOFT, FmtX51, FmtShort },
+ { AL_5POINT1_32F_SOFT, FmtX51, FmtFloat },
- { AL_6POINT1_8, FmtX61, FmtByte },
- { AL_6POINT1_16, FmtX61, FmtShort },
- { AL_6POINT1_32F, FmtX61, FmtFloat },
+ { AL_6POINT1_8_SOFT, FmtX61, FmtByte },
+ { AL_6POINT1_16_SOFT, FmtX61, FmtShort },
+ { AL_6POINT1_32F_SOFT, FmtX61, FmtFloat },
- { AL_7POINT1_8, FmtX71, FmtByte },
- { AL_7POINT1_16, FmtX71, FmtShort },
- { AL_7POINT1_32F, FmtX71, FmtFloat },
+ { AL_7POINT1_8_SOFT, FmtX71, FmtByte },
+ { AL_7POINT1_16_SOFT, FmtX71, FmtShort },
+ { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat },
};
ALuint i;
@@ -2260,19 +2260,19 @@ static ALboolean IsValidType(ALenum type)
{
switch(type)
{
- case AL_BYTE:
- case AL_UNSIGNED_BYTE:
- case AL_SHORT:
- case AL_UNSIGNED_SHORT:
- case AL_INT:
- case AL_UNSIGNED_INT:
- case AL_FLOAT:
- case AL_DOUBLE:
- case AL_MULAW:
- case AL_ALAW:
- case AL_IMA4:
- case AL_BYTE3:
- case AL_UNSIGNED_BYTE3:
+ case AL_BYTE_SOFT:
+ case AL_UNSIGNED_BYTE_SOFT:
+ case AL_SHORT_SOFT:
+ case AL_UNSIGNED_SHORT_SOFT:
+ case AL_INT_SOFT:
+ case AL_UNSIGNED_INT_SOFT:
+ case AL_FLOAT_SOFT:
+ case AL_DOUBLE_SOFT:
+ case AL_BYTE3_SOFT:
+ case AL_UNSIGNED_BYTE3_SOFT:
+ case AL_MULAW_SOFT:
+ case AL_ALAW_SOFT:
+ case AL_IMA4_SOFT:
return AL_TRUE;
}
return AL_FALSE;
@@ -2282,13 +2282,13 @@ static ALboolean IsValidChannels(ALenum channels)
{
switch(channels)
{
- case AL_MONO:
- case AL_STEREO:
- case AL_REAR:
- case AL_QUAD:
- case AL_5POINT1:
- case AL_6POINT1:
- case AL_7POINT1:
+ case AL_MONO_SOFT:
+ case AL_STEREO_SOFT:
+ case AL_REAR_SOFT:
+ case AL_QUAD_SOFT:
+ case AL_5POINT1_SOFT:
+ case AL_6POINT1_SOFT:
+ case AL_7POINT1_SOFT:
return AL_TRUE;
}
return AL_FALSE;
diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c
index 3309338e..1a18ba06 100644
--- a/OpenAL32/alExtension.c
+++ b/OpenAL32/alExtension.c
@@ -139,61 +139,61 @@ static const ALenums enumeration[] = {
{ "AL_FORMAT_STEREO_ALAW_EXT", AL_FORMAT_STEREO_ALAW_EXT },
// Internal Buffer Formats
- { "AL_MONO8", AL_MONO8 },
- { "AL_MONO16", AL_MONO16 },
- { "AL_MONO32F", AL_MONO32F },
- { "AL_STEREO8", AL_STEREO8 },
- { "AL_STEREO16", AL_STEREO16 },
- { "AL_STEREO32F", AL_STEREO32F },
- { "AL_QUAD8", AL_QUAD8 },
- { "AL_QUAD16", AL_QUAD16 },
- { "AL_QUAD32F", AL_QUAD32F },
- { "AL_REAR8", AL_REAR8 },
- { "AL_REAR16", AL_REAR16 },
- { "AL_REAR32F", AL_REAR32F },
- { "AL_5POINT1_8", AL_5POINT1_8 },
- { "AL_5POINT1_16", AL_5POINT1_16 },
- { "AL_5POINT1_32F", AL_5POINT1_32F },
- { "AL_6POINT1_8", AL_6POINT1_8 },
- { "AL_6POINT1_16", AL_6POINT1_16 },
- { "AL_6POINT1_32F", AL_6POINT1_32F },
- { "AL_7POINT1_8", AL_7POINT1_8 },
- { "AL_7POINT1_16", AL_7POINT1_16 },
- { "AL_7POINT1_32F", AL_7POINT1_32F },
+ { "AL_MONO8_SOFT", AL_MONO8_SOFT },
+ { "AL_MONO16_SOFT", AL_MONO16_SOFT },
+ { "AL_MONO32F_SOFT", AL_MONO32F_SOFT },
+ { "AL_STEREO8_SOFT", AL_STEREO8_SOFT },
+ { "AL_STEREO16_SOFT", AL_STEREO16_SOFT },
+ { "AL_STEREO32F_SOFT", AL_STEREO32F_SOFT },
+ { "AL_QUAD8_SOFT", AL_QUAD8_SOFT },
+ { "AL_QUAD16_SOFT", AL_QUAD16_SOFT },
+ { "AL_QUAD32F_SOFT", AL_QUAD32F_SOFT },
+ { "AL_REAR8_SOFT", AL_REAR8_SOFT },
+ { "AL_REAR16_SOFT", AL_REAR16_SOFT },
+ { "AL_REAR32F_SOFT", AL_REAR32F_SOFT },
+ { "AL_5POINT1_8_SOFT", AL_5POINT1_8_SOFT },
+ { "AL_5POINT1_16_SOFT", AL_5POINT1_16_SOFT },
+ { "AL_5POINT1_32F_SOFT", AL_5POINT1_32F_SOFT },
+ { "AL_6POINT1_8_SOFT", AL_6POINT1_8_SOFT },
+ { "AL_6POINT1_16_SOFT", AL_6POINT1_16_SOFT },
+ { "AL_6POINT1_32F_SOFT", AL_6POINT1_32F_SOFT },
+ { "AL_7POINT1_8_SOFT", AL_7POINT1_8_SOFT },
+ { "AL_7POINT1_16_SOFT", AL_7POINT1_16_SOFT },
+ { "AL_7POINT1_32F_SOFT", AL_7POINT1_32F_SOFT },
// Buffer Channel Configurations
- { "AL_MONO", AL_MONO },
- { "AL_STEREO", AL_STEREO },
- { "AL_QUAD", AL_QUAD },
- { "AL_REAR", AL_REAR },
- { "AL_5POINT1", AL_5POINT1 },
- { "AL_6POINT1", AL_6POINT1 },
- { "AL_7POINT1", AL_7POINT1 },
+ { "AL_MONO_SOFT", AL_MONO_SOFT },
+ { "AL_STEREO_SOFT", AL_STEREO_SOFT },
+ { "AL_QUAD_SOFT", AL_QUAD_SOFT },
+ { "AL_REAR_SOFT", AL_REAR_SOFT },
+ { "AL_5POINT1_SOFT", AL_5POINT1_SOFT },
+ { "AL_6POINT1_SOFT", AL_6POINT1_SOFT },
+ { "AL_7POINT1_SOFT", AL_7POINT1_SOFT },
// Buffer Sample Types
- { "AL_BYTE", AL_BYTE },
- { "AL_UNSIGNED_BYTE", AL_UNSIGNED_BYTE },
- { "AL_SHORT", AL_SHORT },
- { "AL_UNSIGNED_SHORT", AL_UNSIGNED_SHORT },
- { "AL_INT", AL_INT },
- { "AL_UNSIGNED_INT", AL_UNSIGNED_INT },
- { "AL_FLOAT", AL_FLOAT },
- { "AL_DOUBLE", AL_DOUBLE },
- { "AL_MULAW", AL_MULAW },
- { "AL_ALAW", AL_ALAW },
- { "AL_IMA4", AL_IMA4 },
- { "AL_BYTE3", AL_BYTE3 },
- { "AL_UNSIGNED_BYTE3", AL_UNSIGNED_BYTE3 },
+ { "AL_BYTE_SOFT", AL_BYTE_SOFT },
+ { "AL_UNSIGNED_BYTE_SOFT", AL_UNSIGNED_BYTE_SOFT },
+ { "AL_SHORT_SOFT", AL_SHORT_SOFT },
+ { "AL_UNSIGNED_SHORT_SOFT", AL_UNSIGNED_SHORT_SOFT },
+ { "AL_INT_SOFT", AL_INT_SOFT },
+ { "AL_UNSIGNED_INT_SOFT", AL_UNSIGNED_INT_SOFT },
+ { "AL_FLOAT_SOFT", AL_FLOAT_SOFT },
+ { "AL_DOUBLE_SOFT", AL_DOUBLE_SOFT },
+ { "AL_BYTE3_SOFT", AL_BYTE3_SOFT },
+ { "AL_UNSIGNED_BYTE3_SOFT", AL_UNSIGNED_BYTE3_SOFT },
+ { "AL_MULAW_SOFT", AL_MULAW_SOFT },
+ { "AL_ALAW_SOFT", AL_ALAW_SOFT },
+ { "AL_IMA4_SOFT", AL_IMA4_SOFT },
// Buffer attributes
{ "AL_FREQUENCY", AL_FREQUENCY },
{ "AL_BITS", AL_BITS },
{ "AL_CHANNELS", AL_CHANNELS },
{ "AL_SIZE", AL_SIZE },
- { "AL_INTERNAL_FORMAT", AL_INTERNAL_FORMAT },
- { "AL_BYTE_LENGTH", AL_BYTE_LENGTH },
- { "AL_SAMPLE_LENGTH", AL_SAMPLE_LENGTH },
- { "AL_SEC_LENGTH", AL_SEC_LENGTH },
+ { "AL_INTERNAL_FORMAT_SOFT", AL_INTERNAL_FORMAT_SOFT },
+ { "AL_BYTE_LENGTH_SOFT", AL_BYTE_LENGTH_SOFT },
+ { "AL_SAMPLE_LENGTH_SOFT", AL_SAMPLE_LENGTH_SOFT },
+ { "AL_SEC_LENGTH_SOFT", AL_SEC_LENGTH_SOFT },
// Buffer States (not supported yet)
{ "AL_UNUSED", AL_UNUSED },