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/alSource.c | |
| parent | b4eaf1ab5a675ff0d75fbec2239fb0ce44d3e06c (diff) | |
Support rear formats directly in the mixer
Diffstat (limited to 'OpenAL32/alSource.c')
| -rw-r--r-- | OpenAL32/alSource.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 8cd1d4a1..70d197ff 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -1887,26 +1887,6 @@ static ALvoid GetSourceOffset(ALsource *Source, ALenum name, ALdouble *offset, A FrameBlockSize * BlockSize); } } - else if(OriginalFormat == AL_FORMAT_REAR_MULAW) - { - offset[0] = (ALdouble)(readPos / 2 / Bytes * 1); - offset[1] = (ALdouble)(writePos / 2 / Bytes * 1); - } - else if(OriginalFormat == AL_FORMAT_REAR8) - { - offset[0] = (ALdouble)(readPos / 2 / Bytes * 1); - offset[1] = (ALdouble)(writePos / 2 / Bytes * 1); - } - else if(OriginalFormat == AL_FORMAT_REAR16) - { - offset[0] = (ALdouble)(readPos / 2 / Bytes * 2); - offset[1] = (ALdouble)(writePos / 2 / Bytes * 2); - } - else if(OriginalFormat == AL_FORMAT_REAR32) - { - offset[0] = (ALdouble)(readPos / 2 / Bytes * 4); - offset[1] = (ALdouble)(writePos / 2 / Bytes * 4); - } else { ALuint OrigBytes = aluBytesFromFormat(OriginalFormat); @@ -2048,17 +2028,6 @@ static ALint FramesFromBytes(ALint offset, ALenum format) offset /= 36 * 2; offset *= 65; } - else if(format == AL_FORMAT_REAR_MULAW) - { - /* Rear is 2 channels */ - offset /= 1 * 2; - } - else if(format == AL_FORMAT_REAR8) - offset /= 1 * 2; - else if(format == AL_FORMAT_REAR16) - offset /= 2 * 2; - else if(format == AL_FORMAT_REAR32) - offset /= 4 * 2; else offset /= aluFrameSizeFromFormat(format); return offset; |