diff options
-rw-r--r-- | Alc/ALu.c | 106 | ||||
-rw-r--r-- | OpenAL32/Include/alu.h | 7 |
2 files changed, 0 insertions, 113 deletions
@@ -37,112 +37,6 @@ #include "bs2b.h" -ALuint aluBytesFromFormat(ALenum format) -{ - switch(format) - { - case AL_FORMAT_MONO8: - case AL_FORMAT_STEREO8: - case AL_FORMAT_QUAD8_LOKI: - case AL_FORMAT_QUAD8: - case AL_FORMAT_REAR8: - case AL_FORMAT_51CHN8: - case AL_FORMAT_61CHN8: - case AL_FORMAT_71CHN8: - return 1; - - case AL_FORMAT_MONO16: - case AL_FORMAT_STEREO16: - case AL_FORMAT_QUAD16_LOKI: - case AL_FORMAT_QUAD16: - case AL_FORMAT_REAR16: - case AL_FORMAT_51CHN16: - case AL_FORMAT_61CHN16: - case AL_FORMAT_71CHN16: - return 2; - - case AL_FORMAT_MONO_FLOAT32: - case AL_FORMAT_STEREO_FLOAT32: - case AL_FORMAT_QUAD32: - case AL_FORMAT_REAR32: - case AL_FORMAT_51CHN32: - case AL_FORMAT_61CHN32: - case AL_FORMAT_71CHN32: - return 4; - - case AL_FORMAT_MONO_DOUBLE_EXT: - case AL_FORMAT_STEREO_DOUBLE_EXT: - return 8; - - case AL_FORMAT_MONO_MULAW: - case AL_FORMAT_STEREO_MULAW: - case AL_FORMAT_QUAD_MULAW: - case AL_FORMAT_REAR_MULAW: - case AL_FORMAT_51CHN_MULAW: - case AL_FORMAT_61CHN_MULAW: - case AL_FORMAT_71CHN_MULAW: - return 1; - - default: - return 0; - } -} -ALuint aluChannelsFromFormat(ALenum format) -{ - switch(format) - { - case AL_FORMAT_MONO8: - case AL_FORMAT_MONO16: - case AL_FORMAT_MONO_FLOAT32: - case AL_FORMAT_MONO_DOUBLE_EXT: - case AL_FORMAT_MONO_MULAW: - return 1; - - case AL_FORMAT_STEREO8: - case AL_FORMAT_STEREO16: - case AL_FORMAT_STEREO_FLOAT32: - case AL_FORMAT_STEREO_DOUBLE_EXT: - case AL_FORMAT_STEREO_MULAW: - return 2; - - case AL_FORMAT_QUAD8_LOKI: - case AL_FORMAT_QUAD16_LOKI: - case AL_FORMAT_QUAD8: - case AL_FORMAT_QUAD16: - case AL_FORMAT_QUAD32: - case AL_FORMAT_QUAD_MULAW: - return 4; - - case AL_FORMAT_REAR8: - case AL_FORMAT_REAR16: - case AL_FORMAT_REAR32: - case AL_FORMAT_REAR_MULAW: - return 2; - - case AL_FORMAT_51CHN8: - case AL_FORMAT_51CHN16: - case AL_FORMAT_51CHN32: - case AL_FORMAT_51CHN_MULAW: - return 6; - - case AL_FORMAT_61CHN8: - case AL_FORMAT_61CHN16: - case AL_FORMAT_61CHN32: - case AL_FORMAT_61CHN_MULAW: - return 7; - - case AL_FORMAT_71CHN8: - case AL_FORMAT_71CHN16: - case AL_FORMAT_71CHN32: - case AL_FORMAT_71CHN_MULAW: - return 8; - - default: - return 0; - } -} - - static __inline ALvoid aluCrossproduct(const ALfloat *inVector1, const ALfloat *inVector2, ALfloat *outVector) { outVector[0] = inVector1[1]*inVector2[2] - inVector1[2]*inVector2[1]; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index a0c0e4b3..cc47cc1b 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -95,13 +95,6 @@ typedef enum { #endif -ALuint aluBytesFromFormat(ALenum format); -ALuint aluChannelsFromFormat(ALenum format); -static __inline ALuint aluFrameSizeFromFormat(ALenum format) -{ - return aluBytesFromFormat(format) * aluChannelsFromFormat(format); -} - static __inline ALdouble lerp(ALdouble val1, ALdouble val2, ALdouble mu) { return val1 + (val2-val1)*mu; |