diff options
| author | Max Horn | 2010-01-23 23:55:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-23 23:55:35 +0000 |
| commit | 4b996e7de7d25a650f1ae73722af827fcab7b4d6 (patch) | |
| tree | ea6e7a352a7adaf3e04fbb64716ed8c04c85ea1b /engines/sword1 | |
| parent | 9369c9f3c518d394b50b04afcf91e7cc5f2f39be (diff) | |
| download | scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.gz scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.bz2 scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.zip | |
Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
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 d3ef4382e0..d28ab8efd9 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -271,7 +271,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, DisposeAfterUse::NO, 11025, flags), + Audio::makeRawMemoryStream(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); } @@ -360,7 +360,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, DisposeAfterUse::YES, 11025, SPEECH_FLAGS); + stream = Audio::makeRawMemoryStream((byte *)data, size, 11025, SPEECH_FLAGS); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan); } } else if (_cowMode == CowPSX && sampleSize != 0xffffffff) { |