diff options
| author | Max Horn | 2010-01-23 23:55:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-23 23:55:35 +0000 |
| commit | 4b996e7de7d25a650f1ae73722af827fcab7b4d6 (patch) | |
| tree | ea6e7a352a7adaf3e04fbb64716ed8c04c85ea1b /engines/scumm/he/sound_he.cpp | |
| parent | 9369c9f3c518d394b50b04afcf91e7cc5f2f39be (diff) | |
| download | scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.gz scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.bz2 scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.zip | |
Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
Diffstat (limited to 'engines/scumm/he/sound_he.cpp')
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 48adca2ca9..69e18fee76 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -574,7 +574,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) musicFile.close(); if (_vm->_game.heversion == 70) { - stream = Audio::makeRawMemoryStream(spoolPtr, size, DisposeAfterUse::NO, 11025, flags); + stream = Audio::makeRawMemoryStream(spoolPtr, size, 11025, flags, DisposeAfterUse::NO); _mixer->playInputStream(type, &_heSoundChannels[heChannel], stream, soundID); return; } @@ -667,9 +667,9 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) #ifdef SCUMM_LITTLE_ENDIAN flags |= Audio::FLAG_LITTLE_ENDIAN; #endif - stream = Audio::makeRawMemoryStream(sound + heOffset, size - heOffset, DisposeAfterUse::YES, rate, flags); + stream = Audio::makeRawMemoryStream(sound + heOffset, size - heOffset, rate, flags); } else { - stream = Audio::makeRawMemoryStream(ptr + memStream.pos() + heOffset, size - heOffset, DisposeAfterUse::YES, rate, flags); + stream = Audio::makeRawMemoryStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags); } _mixer->playInputStream(type, &_heSoundChannels[heChannel], Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID); @@ -729,7 +729,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _mixer->stopHandle(_heSoundChannels[heChannel]); - stream = Audio::makeRawMemoryStream(ptr + heOffset + 8, size, DisposeAfterUse::NO, rate, flags); + stream = Audio::makeRawMemoryStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO); _mixer->playInputStream(type, &_heSoundChannels[heChannel], Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID); } @@ -750,7 +750,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _mixer->stopID(_currentMusic); _currentMusic = soundID; - stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, 0); + stream = Audio::makeRawMemoryStream(sound, size, rate, 0); _mixer->playInputStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID); } else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) { |