diff options
| author | Eugene Sandulenko | 2016-11-29 10:28:11 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-11-29 18:45:04 +0100 |
| commit | dd4f48f4d79f68e10511a334efd163a8058c0e5a (patch) | |
| tree | 5835432e471698ebbdbfcbc2eada7f9aaef05ebe | |
| parent | 6958e38e84041a989a961ad53a25722dc3683d9e (diff) | |
| download | scummvm-rg350-dd4f48f4d79f68e10511a334efd163a8058c0e5a.tar.gz scummvm-rg350-dd4f48f4d79f68e10511a334efd163a8058c0e5a.tar.bz2 scummvm-rg350-dd4f48f4d79f68e10511a334efd163a8058c0e5a.zip | |
FULLPIPE: Unstub StopAllSoundStreams()
| -rw-r--r-- | engines/fullpipe/sound.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index cc0bf13b60..504ea0c1ae 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -386,12 +386,10 @@ void FullpipeEngine::startSoundStream1(const char *trackName) { } void FullpipeEngine::stopAllSounds() { - _mixer->stopHandle(*_soundStream1); - _mixer->stopHandle(*_soundStream2); - _mixer->stopHandle(*_soundStream3); - _mixer->stopHandle(*_soundStream4); - - _stream2playing = false; + for (int i = 0; i < _currSoundListCount; i++) + for (int j = 0; j < _currSoundList1[i]->getCount(); j++) { + _currSoundList1[i]->getSoundByIndex(j)->stop(); + } } void FullpipeEngine::toggleMute() { @@ -522,10 +520,12 @@ void FullpipeEngine::stopSoundStream2() { } void FullpipeEngine::stopAllSoundStreams() { - warning("STUB: stopAllSoundStreams()"); + _mixer->stopHandle(*_soundStream1); + _mixer->stopHandle(*_soundStream2); + _mixer->stopHandle(*_soundStream3); + _mixer->stopHandle(*_soundStream4); - // TODO: Differences from stopAllSounds() - _mixer->stopAll(); + _stream2playing = false; } void FullpipeEngine::stopAllSoundInstances(int id) { |