diff options
| author | Johannes Schickel | 2009-08-17 13:49:56 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-17 13:49:56 +0000 |
| commit | 516dd5c9a4157ab63b20c6e04b698a63dcf8cd65 (patch) | |
| tree | 99494b1f4cc03f10193b2e01224bdd2c1c6a5576 /sound/audiostream.cpp | |
| parent | 77689a05a2e13c5bfaeb286db195cf36b2ce2333 (diff) | |
| download | scummvm-rg350-516dd5c9a4157ab63b20c6e04b698a63dcf8cd65.tar.gz scummvm-rg350-516dd5c9a4157ab63b20c6e04b698a63dcf8cd65.tar.bz2 scummvm-rg350-516dd5c9a4157ab63b20c6e04b698a63dcf8cd65.zip | |
Slight cleanup to makeLinearDiskStream interface.
svn-id: r43481
Diffstat (limited to 'sound/audiostream.cpp')
| -rw-r--r-- | sound/audiostream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index ce4022bab6..783a5733b3 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -406,14 +406,14 @@ AudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte f #define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \ if (is16Bit) { \ if (isLE) \ - return new LinearDiskStream<STEREO, true, UNSIGNED, true>(rate, loopStart, loopEnd, takeOwnership, &stream, block, numBlocks, loop); \ + return new LinearDiskStream<STEREO, true, UNSIGNED, true>(rate, loopStart, loopEnd, takeOwnership, stream, block, numBlocks, loop); \ else \ - return new LinearDiskStream<STEREO, true, UNSIGNED, false>(rate, loopStart, loopEnd, takeOwnership, &stream, block, numBlocks, loop); \ + return new LinearDiskStream<STEREO, true, UNSIGNED, false>(rate, loopStart, loopEnd, takeOwnership, stream, block, numBlocks, loop); \ } else \ - return new LinearDiskStream<STEREO, false, UNSIGNED, false>(rate, loopStart, loopEnd, takeOwnership, &stream, block, numBlocks, loop) + return new LinearDiskStream<STEREO, false, UNSIGNED, false>(rate, loopStart, loopEnd, takeOwnership, stream, block, numBlocks, loop) -AudioStream *makeLinearDiskStream(Common::SeekableReadStream& stream, LinearDiskStreamAudioBlock* block, int numBlocks, int rate, byte flags, bool takeOwnership, uint loopStart, uint loopEnd) { +AudioStream *makeLinearDiskStream(Common::SeekableReadStream *stream, LinearDiskStreamAudioBlock *block, int numBlocks, int rate, byte flags, bool takeOwnership, uint loopStart, uint loopEnd) { const bool isStereo = (flags & Audio::Mixer::FLAG_STEREO) != 0; const bool is16Bit = (flags & Audio::Mixer::FLAG_16BITS) != 0; const bool isUnsigned = (flags & Audio::Mixer::FLAG_UNSIGNED) != 0; |