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/m4 | |
| 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/m4')
| -rw-r--r-- | engines/m4/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp index 63956259b3..37fe36cf2b 100644 --- a/engines/m4/sound.cpp +++ b/engines/m4/sound.cpp @@ -94,7 +94,7 @@ void Sound::playSound(const char *soundName, int volume, bool loop, int channel) // Sound format is 8bit mono, unsigned, 11025kHz Audio::AudioStream *stream = Audio::makeLoopingAudioStream( - Audio::makeRawMemoryStream(buffer, bufferSize, 11025, Audio::FLAG_UNSIGNED), + Audio::makeRawStream(buffer, bufferSize, 11025, Audio::FLAG_UNSIGNED), loop ? 0 : 1); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume); } @@ -146,7 +146,7 @@ void Sound::playVoice(const char *soundName, int volume) { _vm->res()->toss(soundName); // Voice format is 8bit mono, unsigned, 11025kHz - Audio::AudioStream *stream = Audio::makeRawMemoryStream(buffer, soundStream->size(), 11025, Audio::FLAG_UNSIGNED); + Audio::AudioStream *stream = Audio::makeRawStream(buffer, soundStream->size(), 11025, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume); } @@ -259,7 +259,7 @@ void Sound::playDSRSound(int soundIndex, int volume, bool loop) { // Play sound Audio::AudioStream *stream = Audio::makeLoopingAudioStream( - Audio::makeRawMemoryStream(buffer, + Audio::makeRawStream(buffer, _dsrFile.dsrEntries[soundIndex]->uncompSize, _dsrFile.dsrEntries[soundIndex]->frequency, Audio::FLAG_UNSIGNED), loop ? 0 : 1); |