diff options
| author | Max Horn | 2010-01-19 11:20:58 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-19 11:20:58 +0000 |
| commit | b227c660c6f0491a409a35bbb317f8558258e338 (patch) | |
| tree | 23a14b43286f1ce8d2b92550284d9cd0a785b896 /engines/sword1 | |
| parent | f0a0ed8f9e01d3943f635b92af6f71ca83814f13 (diff) | |
| download | scummvm-rg350-b227c660c6f0491a409a35bbb317f8558258e338.tar.gz scummvm-rg350-b227c660c6f0491a409a35bbb317f8558258e338.tar.bz2 scummvm-rg350-b227c660c6f0491a409a35bbb317f8558258e338.zip | |
Remove loop start/end params from Mixer::playRaw; convert some code from Mixer::playRaw to Mixer::playInputStream
svn-id: r47375
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/sound.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index e253483429..1c471a8de1 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -38,6 +38,7 @@ #include "sound/flac.h" #include "sound/mp3.h" +#include "sound/raw.h" #include "sound/vorbis.h" #include "sound/wave.h" #include "sound/vag.h" @@ -271,7 +272,8 @@ void Sound::playSample(QueueElement *elem) { flags |= Audio::Mixer::FLAG_STEREO; if (_fxList[elem->id].type == FX_LOOP) flags |= Audio::Mixer::FLAG_LOOP; - _mixer->playRaw(Audio::Mixer::kSFXSoundType, &elem->handle, sampleData + 0x2C, size, DisposeAfterUse::NO, 11025, flags, elem->id, volume, pan, 0, 0); + Audio::AudioStream *stream = Audio::makeRawMemoryStream(sampleData + 0x2C, size, DisposeAfterUse::NO, 11025, flags, 0, 0); + _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, stream, elem->id, volume, pan); } } } else |