diff options
| author | Johannes Schickel | 2010-04-03 15:56:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-04-03 15:56:40 +0000 |
| commit | 5412dac46f06570c3d241ff63b3c94b8f277bea6 (patch) | |
| tree | ce325777468462b182557ccf89c2e7f4a1366543 /sound/decoders | |
| parent | 3b88a6ad5e3a7874b1d28a6c6d8c272c9faf5435 (diff) | |
| download | scummvm-rg350-5412dac46f06570c3d241ff63b3c94b8f277bea6.tar.gz scummvm-rg350-5412dac46f06570c3d241ff63b3c94b8f277bea6.tar.bz2 scummvm-rg350-5412dac46f06570c3d241ff63b3c94b8f277bea6.zip | |
Cleanup.
svn-id: r48495
Diffstat (limited to 'sound/decoders')
| -rw-r--r-- | sound/decoders/raw.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/decoders/raw.cpp b/sound/decoders/raw.cpp index 61884e2951..a7122ee75d 100644 --- a/sound/decoders/raw.cpp +++ b/sound/decoders/raw.cpp @@ -159,7 +159,7 @@ int RawStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer, cons // If that is not the case, we should probably stop the // stream playback. _stream->seek(_filePos, SEEK_SET); - _stream->read(_buffer, readAmount * (is16Bit? 2: 1)); + _stream->read(_buffer, readAmount * (is16Bit ? 2 : 1)); // Amount of data in buffer is now the amount read in, and // the amount left to read on disk is decreased by the same amount @@ -231,7 +231,7 @@ bool RawStream<stereo, is16Bit, isUnsigned, isLE>::seek(const Timestamp &where) * particular case it should actually help it :-) */ -#define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \ +#define MAKE_RAW_STREAM(STEREO, UNSIGNED) \ if (is16Bit) { \ if (isLE) \ return new RawStream<STEREO, true, UNSIGNED, true>(rate, disposeAfterUse, stream, blockList); \ @@ -259,15 +259,15 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream, if (isStereo) { if (isUnsigned) { - MAKE_LINEAR_DISK(true, true); + MAKE_RAW_STREAM(true, true); } else { - MAKE_LINEAR_DISK(true, false); + MAKE_RAW_STREAM(true, false); } } else { if (isUnsigned) { - MAKE_LINEAR_DISK(false, true); + MAKE_RAW_STREAM(false, true); } else { - MAKE_LINEAR_DISK(false, false); + MAKE_RAW_STREAM(false, false); } } } |