diff options
| author | Chris Robinson <[email protected]> | 2010-11-27 22:55:20 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-11-27 22:55:20 -0800 |
| commit | 2fd8d6916bae6b681f065e5dfe1f962641f41533 (patch) | |
| tree | b7571b820aa7cc8ada05ebd58c7efa7f4b8d5c95 /OpenAL32/Include | |
| parent | b4eaf1ab5a675ff0d75fbec2239fb0ce44d3e06c (diff) | |
Support rear formats directly in the mixer
Diffstat (limited to 'OpenAL32/Include')
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 1 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index c8220a12..7d5b4fc2 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -41,6 +41,7 @@ enum FmtChannels { FmtMono, FmtStereo, FmtQuad, + FmtRear, Fmt51ChanWFX, Fmt61ChanWFX, Fmt71ChanWFX, diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 533dd9da..698fccfd 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -105,6 +105,7 @@ static __inline ALuint aluBytesFromFormat(ALenum format) 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: @@ -114,6 +115,7 @@ static __inline ALuint aluBytesFromFormat(ALenum format) 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: @@ -122,6 +124,7 @@ static __inline ALuint aluBytesFromFormat(ALenum format) 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: @@ -134,6 +137,7 @@ static __inline ALuint aluBytesFromFormat(ALenum format) 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: @@ -169,6 +173,12 @@ static __inline ALuint aluChannelsFromFormat(ALenum format) 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: |