diff options
Diffstat (limited to 'OpenAL32/alBuffer.c')
| -rw-r--r-- | OpenAL32/alBuffer.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index a4b19a95..6dda6738 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -1199,57 +1199,57 @@ static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum Fm enum FmtChannels channels; enum FmtType type; } list[] = { - { AL_MONO8_SOFT, FmtMono, FmtByte }, - { AL_MONO16_SOFT, FmtMono, FmtShort }, - { AL_MONO32F_SOFT, FmtMono, FmtFloat }, - { AL_FORMAT_MONO_MULAW, FmtMono, FmtMulaw }, - { AL_FORMAT_MONO_ALAW_EXT, FmtMono, FmtAlaw }, - - { AL_STEREO8_SOFT, FmtStereo, FmtByte }, - { AL_STEREO16_SOFT, FmtStereo, FmtShort }, - { AL_STEREO32F_SOFT, FmtStereo, FmtFloat }, - { AL_FORMAT_STEREO_MULAW, FmtStereo, FmtMulaw }, - { AL_FORMAT_STEREO_ALAW_EXT, FmtStereo, FmtAlaw }, - - { AL_REAR8_SOFT, FmtRear, FmtByte }, - { AL_REAR16_SOFT, FmtRear, FmtShort }, - { AL_REAR32F_SOFT, FmtRear, FmtFloat }, + { AL_FORMAT_MONO8, FmtMono, FmtByte }, + { AL_FORMAT_MONO16, FmtMono, FmtShort }, + { AL_FORMAT_MONO_FLOAT32, FmtMono, FmtFloat }, + { AL_FORMAT_MONO_MULAW, FmtMono, FmtMulaw }, + { AL_FORMAT_MONO_ALAW_EXT, FmtMono, FmtAlaw }, + + { AL_FORMAT_STEREO8, FmtStereo, FmtByte }, + { AL_FORMAT_STEREO16, FmtStereo, FmtShort }, + { AL_FORMAT_STEREO_FLOAT32, FmtStereo, FmtFloat }, + { AL_FORMAT_STEREO_MULAW, FmtStereo, FmtMulaw }, + { AL_FORMAT_STEREO_ALAW_EXT, FmtStereo, FmtAlaw }, + + { AL_FORMAT_REAR8, FmtRear, FmtByte }, + { AL_FORMAT_REAR16, FmtRear, FmtShort }, + { AL_FORMAT_REAR32, FmtRear, FmtFloat }, { AL_FORMAT_REAR_MULAW, FmtRear, FmtMulaw }, { AL_FORMAT_QUAD8_LOKI, FmtQuad, FmtByte }, { AL_FORMAT_QUAD16_LOKI, FmtQuad, FmtShort }, - { AL_QUAD8_SOFT, FmtQuad, FmtByte }, - { AL_QUAD16_SOFT, FmtQuad, FmtShort }, - { AL_QUAD32F_SOFT, FmtQuad, FmtFloat }, + { AL_FORMAT_QUAD8, FmtQuad, FmtByte }, + { AL_FORMAT_QUAD16, FmtQuad, FmtShort }, + { AL_FORMAT_QUAD32, FmtQuad, FmtFloat }, { AL_FORMAT_QUAD_MULAW, FmtQuad, FmtMulaw }, - { AL_5POINT1_8_SOFT, FmtX51, FmtByte }, - { AL_5POINT1_16_SOFT, FmtX51, FmtShort }, - { AL_5POINT1_32F_SOFT, FmtX51, FmtFloat }, + { AL_FORMAT_51CHN8, FmtX51, FmtByte }, + { AL_FORMAT_51CHN16, FmtX51, FmtShort }, + { AL_FORMAT_51CHN32, FmtX51, FmtFloat }, { AL_FORMAT_51CHN_MULAW, FmtX51, FmtMulaw }, - { AL_6POINT1_8_SOFT, FmtX61, FmtByte }, - { AL_6POINT1_16_SOFT, FmtX61, FmtShort }, - { AL_6POINT1_32F_SOFT, FmtX61, FmtFloat }, + { AL_FORMAT_61CHN8, FmtX61, FmtByte }, + { AL_FORMAT_61CHN16, FmtX61, FmtShort }, + { AL_FORMAT_61CHN32, FmtX61, FmtFloat }, { AL_FORMAT_61CHN_MULAW, FmtX61, FmtMulaw }, - { AL_7POINT1_8_SOFT, FmtX71, FmtByte }, - { AL_7POINT1_16_SOFT, FmtX71, FmtShort }, - { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat }, + { AL_FORMAT_71CHN8, FmtX71, FmtByte }, + { AL_FORMAT_71CHN16, FmtX71, FmtShort }, + { AL_FORMAT_71CHN32, FmtX71, FmtFloat }, { AL_FORMAT_71CHN_MULAW, FmtX71, FmtMulaw }, - { AL_BFORMAT2D_8_SOFT, FmtBFormat2D, FmtByte }, - { AL_BFORMAT2D_16_SOFT, FmtBFormat2D, FmtShort }, - { AL_BFORMAT2D_32F_SOFT, FmtBFormat2D, FmtFloat }, - { AL_FORMAT_BFORMAT2D_MULAW, FmtBFormat2D, FmtMulaw }, + { AL_FORMAT_BFORMAT2D_8, FmtBFormat2D, FmtByte }, + { AL_FORMAT_BFORMAT2D_16, FmtBFormat2D, FmtShort }, + { AL_FORMAT_BFORMAT2D_FLOAT32, FmtBFormat2D, FmtFloat }, + { AL_FORMAT_BFORMAT2D_MULAW, FmtBFormat2D, FmtMulaw }, - { AL_BFORMAT3D_8_SOFT, FmtBFormat3D, FmtByte }, - { AL_BFORMAT3D_16_SOFT, FmtBFormat3D, FmtShort }, - { AL_BFORMAT3D_32F_SOFT, FmtBFormat3D, FmtFloat }, - { AL_FORMAT_BFORMAT3D_MULAW, FmtBFormat3D, FmtMulaw }, + { AL_FORMAT_BFORMAT3D_8, FmtBFormat3D, FmtByte }, + { AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort }, + { AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat }, + { AL_FORMAT_BFORMAT3D_MULAW, FmtBFormat3D, FmtMulaw }, }; - ALuint i; + size_t i; for(i = 0;i < COUNTOF(list);i++) { |