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/sky | |
| 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/sky')
| -rw-r--r-- | engines/sky/intro.cpp | 6 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index a1b97b6b1b..c926aa30e6 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -739,7 +739,7 @@ bool Intro::nextPart(uint16 *&data) { // directly, but this will have to do for now. memset(vData, 127, sizeof(DataFileHeader)); - stream = Audio::makeRawMemoryStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE); return true; case WAITVOICE: @@ -755,12 +755,12 @@ bool Intro::nextPart(uint16 *&data) { return true; case LOOPBG: _mixer->stopID(SOUND_BG); - stream = Audio::makeRawMemoryStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG); return true; case PLAYBG: _mixer->stopID(SOUND_BG); - stream = Audio::makeRawMemoryStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED); + stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG); return true; case STOPBG: diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index eb9f1e57b9..179bb5e37a 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1045,7 +1045,7 @@ void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *h _mixer->stopID(id); - Audio::AudioStream *stream = Audio::makeRawMemoryStream(buffer, size, 11025, flags); + Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, 11025, flags); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream, id); } @@ -1111,7 +1111,7 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) { uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6); dataOfs += _sfxBaseOfs; - Audio::SeekableAudioStream *stream = Audio::makeRawMemoryStream(_soundData + dataOfs, dataSize, sampleRate, + Audio::SeekableAudioStream *stream = Audio::makeRawStream(_soundData + dataOfs, dataSize, sampleRate, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); Audio::AudioStream *output = 0; @@ -1251,7 +1251,7 @@ bool Sound::startSpeech(uint16 textNum) { _mixer->stopID(SOUND_SPEECH); - Audio::AudioStream *stream = Audio::makeRawMemoryStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED); + Audio::AudioStream *stream = Audio::makeRawStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH); return true; } |