diff options
| author | Chris Robinson <[email protected]> | 2012-01-10 00:58:07 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-01-10 00:59:10 -0800 |
| commit | 29ba8f9f1a908610b77c8991af106c94d4918afb (patch) | |
| tree | 4d2b60f4d40af98f2f0038dbe6483f7f0080b80b | |
| parent | 61af4d715c8a3d9568be8ef8dab1d765c11d8dc0 (diff) | |
Remove the unnecessary AL_MULAW_SOFT, AL_ALAW_SOFT, and AL_IMA4_SOFT defines
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 6 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 3 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.c | 3 | ||||
| -rw-r--r-- | OpenAL32/alExtension.c | 3 |
4 files changed, 3 insertions, 12 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index 6802ab7b..397c8075 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -19,9 +19,9 @@ enum UserFmtType { 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, + UserFmtMulaw, + UserFmtAlaw, + UserFmtIMA4, }; enum UserFmtChannels { UserFmtMono = AL_MONO_SOFT, diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 27951e90..4a0fcc04 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -62,9 +62,6 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe #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_SOFT 0x1500 diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index 446c6e4e..f56ca5c7 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -2270,9 +2270,6 @@ static ALboolean IsValidType(ALenum type) 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; diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c index 1a18ba06..06dee4e2 100644 --- a/OpenAL32/alExtension.c +++ b/OpenAL32/alExtension.c @@ -181,9 +181,6 @@ static const ALenums enumeration[] = { { "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 }, |