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/sword1 | |
| 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/sword1')
| -rw-r--r-- | engines/sword1/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index a9fe37242b..e1a34d622f 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -272,7 +272,7 @@ void Sound::playSample(QueueElement *elem) { if (READ_LE_UINT16(sampleData + 0x16) == 2) flags |= Audio::FLAG_STEREO; Audio::AudioStream *stream = Audio::makeLoopingAudioStream( - Audio::makeRawMemoryStream(sampleData + 0x2C, size, 11025, flags, DisposeAfterUse::NO), + Audio::makeRawStream(sampleData + 0x2C, size, 11025, flags, DisposeAfterUse::NO), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, stream, elem->id, volume, pan); } @@ -361,7 +361,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { uint32 size; int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size); if (data) { - stream = Audio::makeRawMemoryStream((byte *)data, size, 11025, SPEECH_FLAGS); + stream = Audio::makeRawStream((byte *)data, size, 11025, SPEECH_FLAGS); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan); } } else if (_cowMode == CowPSX && sampleSize != 0xffffffff) { |