diff options
| author | Max Horn | 2005-01-09 15:48:27 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-09 15:48:27 +0000 |
| commit | 0fb2bd30f44be62f2aa5204dd31abea26d2e4b3d (patch) | |
| tree | f3cbfa24848622e35c1f3946621c6cc5def6a186 | |
| parent | 6563990ad2d9a60b675a51c46ffcc93e5a57c5e7 (diff) | |
| download | scummvm-rg350-0fb2bd30f44be62f2aa5204dd31abea26d2e4b3d.tar.gz scummvm-rg350-0fb2bd30f44be62f2aa5204dd31abea26d2e4b3d.tar.bz2 scummvm-rg350-0fb2bd30f44be62f2aa5204dd31abea26d2e4b3d.zip | |
cleanup
svn-id: r16500
| -rw-r--r-- | sound/audiostream.cpp | 12 | ||||
| -rw-r--r-- | sound/audiostream.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 6d283e0c92..ddc91dcbf1 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -185,12 +185,12 @@ int LinearMemoryStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buf } else \ return new LinearMemoryStream<STEREO, false, UNSIGNED, false>(rate, ptr, len, loopOffset, loopLen, autoFree) -AudioStream *makeLinearInputStream(int rate, byte _flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen) { - const bool isStereo = (_flags & SoundMixer::FLAG_STEREO) != 0; - const bool is16Bit = (_flags & SoundMixer::FLAG_16BITS) != 0; - const bool isUnsigned = (_flags & SoundMixer::FLAG_UNSIGNED) != 0; - const bool isLE = (_flags & SoundMixer::FLAG_LITTLE_ENDIAN) != 0; - const bool autoFree = (_flags & SoundMixer::FLAG_AUTOFREE) != 0; +AudioStream *makeLinearInputStream(int rate, byte flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen) { + const bool isStereo = (flags & SoundMixer::FLAG_STEREO) != 0; + const bool is16Bit = (flags & SoundMixer::FLAG_16BITS) != 0; + const bool isUnsigned = (flags & SoundMixer::FLAG_UNSIGNED) != 0; + const bool isLE = (flags & SoundMixer::FLAG_LITTLE_ENDIAN) != 0; + const bool autoFree = (flags & SoundMixer::FLAG_AUTOFREE) != 0; if (isStereo) { if (isUnsigned) { diff --git a/sound/audiostream.h b/sound/audiostream.h index 215414a57f..f6017c9698 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -102,7 +102,7 @@ public: int getRate() const { return -1; } }; -AudioStream *makeLinearInputStream(int rate, byte _flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen); +AudioStream *makeLinearInputStream(int rate, byte flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen); // This used to be an inline template function, but |