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/sound.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/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 6061c775a9..64d2e284ce 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -203,7 +203,7 @@ void Sound::playSound(int soundID) { sound = (byte *)malloc(size); memcpy(sound, ptr, size); - stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID); } // WORKAROUND bug # 1311447 @@ -226,7 +226,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (byte *)malloc(size); memcpy(sound, ptr, size); - stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID); } // Support for sampled sound effects in Monkey Island 1 and 2 @@ -298,7 +298,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (byte *)malloc(size); memcpy(sound, ptr + 6, size); - stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID); } else if ((_vm->_game.platform == Common::kPlatformFMTowns && _vm->_game.version == 3) || READ_BE_UINT32(ptr) == MKID_BE('SOUN') || READ_BE_UINT32(ptr) == MKID_BE('TOWS')) { @@ -349,7 +349,7 @@ void Sound::playSound(int soundID) { } size -= waveSize; - stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED, loopStart, loopEnd); + stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, rate, Audio::FLAG_UNSIGNED, loopStart, loopEnd); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0); } break; @@ -440,7 +440,7 @@ void Sound::playSound(int soundID) { } memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size); - stream = Audio::makeRawMemoryStream_OLD(sound, size, DisposeAfterUse::YES, rate, 0, loopStart, loopEnd); + stream = Audio::makeRawMemoryStream_OLD(sound, size, rate, 0, loopStart, loopEnd); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, vol, 0); } else { |