thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder params to Audio::makeRawMemoryStream

Browse source 
svn-id: r47492
This commit is contained in:
Max Horn 2010-01-23 23:55:35 +00:00
parent 9369c9f3c5
commit 4b996e7de7
34 changed files with 75 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sword1/sound.cpp
View file

@ -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) {