From dd4f48f4d79f68e10511a334efd163a8058c0e5a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 29 Nov 2016 10:28:11 +0100 Subject: FULLPIPE: Unstub StopAllSoundStreams() --- engines/fullpipe/sound.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/fullpipe/sound.cpp') 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) { -- cgit v1.2.3