diff options
| author | Johannes Schickel | 2010-01-30 15:26:54 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-30 15:26:54 +0000 |
| commit | a505d32eff97e31ac73495e202f9c01f6490dcf8 (patch) | |
| tree | 30e61278463fd597ec20044fc2036f4ef0f29d08 /engines/scumm/he | |
| parent | 8e3646e062528d1604d28676fa2faec5c5ac878b (diff) | |
| download | scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.tar.gz scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.tar.bz2 scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.zip | |
Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index f785cf8282..17483b6bd9 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -171,7 +171,7 @@ void CUP_Player::updateSfx() { uint32 soundSize = READ_BE_UINT32(soundData + 4); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, Audio::makeLoopingAudioStream( - Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, + Audio::makeRawStream(soundData + 8, soundSize - 8, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO), (sfx->flags & kSfxFlagLoop) ? 0 : 1 ) diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index cdd7e5a49b..d8924999a1 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, 11025, flags, DisposeAfterUse::NO); + stream = Audio::makeRawStream(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, rate, flags); + stream = Audio::makeRawStream(sound + heOffset, size - heOffset, rate, flags); } else { - stream = Audio::makeRawMemoryStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO); + stream = Audio::makeRawStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO); } _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, rate, flags, DisposeAfterUse::NO); + stream = Audio::makeRawStream(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, rate, 0); + stream = Audio::makeRawStream(sound, size, rate, 0); _mixer->playInputStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID); } else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) { |