diff options
author | Max Horn | 2010-01-23 13:34:29 +0000 |
---|---|---|
committer | Max Horn | 2010-01-23 13:34:29 +0000 |
commit | b036392a7b1c49a3a9d1ac0d0dd035feb7063058 (patch) | |
tree | fe364e82b44df12bfd9acfd1b3726a25c0f4f02c /engines/scumm/sound.cpp | |
parent | 7eb407be80857b27c718e4e6f22de61c4d88b183 (diff) | |
download | scummvm-rg350-b036392a7b1c49a3a9d1ac0d0dd035feb7063058.tar.gz scummvm-rg350-b036392a7b1c49a3a9d1ac0d0dd035feb7063058.tar.bz2 scummvm-rg350-b036392a7b1c49a3a9d1ac0d0dd035feb7063058.zip |
Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change
svn-id: r47472
Diffstat (limited to 'engines/scumm/sound.cpp')
-rw-r--r-- | engines/scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index e9aa6079b5..05912208b0 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -353,7 +353,7 @@ void Sound::playSound(int soundID) { if (loopEnd > 0) flags |= Audio::FLAG_LOOP; - stream = Audio::makeRawMemoryStream(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd); + stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0); } break; @@ -446,7 +446,7 @@ void Sound::playSound(int soundID) { } memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size); - stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd); + stream = Audio::makeRawMemoryStream_OLD(sound, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, vol, 0); } else { |