diff options
| author | Max Horn | 2010-01-08 22:09:43 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-08 22:09:43 +0000 |
| commit | f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1 (patch) | |
| tree | b628cb494432e593a24a19134817798d14672048 /engines/sword1 | |
| parent | 490153232a89bc64deb8a2ea72443af986940e63 (diff) | |
| download | scummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.tar.gz scummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.tar.bz2 scummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.zip | |
Switch Mixer::playInputStream to use DisposeAfterUse::Flag
svn-id: r47182
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/music.cpp | 2 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index c46f980cd0..de5906713e 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -237,7 +237,7 @@ Music::Music(Audio::Mixer *pMixer) { _converter[0] = NULL; _converter[1] = NULL; _volumeL = _volumeR = 192; - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); } Music::~Music() { diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 31439d587d..98b87d56ea 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -259,7 +259,7 @@ void Sound::playSample(QueueElement *elem) { if (SwordEngine::isPsx()) { ; uint32 size = READ_LE_UINT32(sampleData); Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(new Audio::VagStream(new Common::MemoryReadStream(sampleData + 4, size-4)), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan, false, false, false); + _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan, DisposeAfterUse::NO, false, false); } else { uint32 size = READ_LE_UINT32(sampleData + 0x28); uint8 flags; |