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/kyra | |
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/kyra')
-rw-r--r-- | engines/kyra/sound_adlib.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_amiga.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/sound_pcspk.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_towns.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 3da1204a5d..51f5ba9392 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -451,7 +451,7 @@ AdlibDriver::AdlibDriver(Audio::Mixer *mixer, bool v2) { // is used by SFX or music, and then adjust the volume accordingly. Since Kyrandia 2 supports // different volumes for SFX and music, looking at the disasm and checking how the original does it // would be a good idea. - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); _samplesPerCallback = getRate() / CALLBACKS_PER_SECOND; _samplesPerCallbackRemainder = getRate() % CALLBACKS_PER_SECOND; diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 38565ad023..751c5eba88 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -154,7 +154,7 @@ void SoundAmiga::playTrack(uint8 track) { _driver->setVolume(volume); _driver->setTempo(tempo << 4); if (!_mixer->isSoundHandleActive(_musicHandle)) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO); } } else if (track == 0) _driver->stopMusic(); @@ -215,7 +215,7 @@ void SoundAmiga::playSoundEffect(uint8 track) { if (_sfxEnabled && sfx) { const bool success = _driver->playNote(sfx->note, sfx->patch, sfx->duration, sfx->volume, pan); if (success && !_mixer->isSoundHandleActive(_musicHandle)) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO); } } diff --git a/engines/kyra/sound_pcspk.cpp b/engines/kyra/sound_pcspk.cpp index 8da356072a..b694c8ceb8 100644 --- a/engines/kyra/sound_pcspk.cpp +++ b/engines/kyra/sound_pcspk.cpp @@ -41,7 +41,7 @@ MidiDriver_PCSpeaker::MidiDriver_PCSpeaker(Audio::Mixer *mixer) _speaker = new Audio::PCSpeaker(_rate); assert(_speaker); - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); _countdown = 0xFFFF; _hardwareChannel[0] = 0xFF; diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 8e24d6f47b..ff4ba7e120 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -624,7 +624,7 @@ int Towns_EuphonyDriver::open() { MidiDriver_Emulated::open(); _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, - this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); return 0; } @@ -2977,7 +2977,7 @@ bool TownsPC98_OpnCore::init() { } _mixer->playInputStream(Audio::Mixer::kMusicSoundType, - &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); _ready = true; |