From a6d2feb8c462a977c39408fa28131a6daf94e7c7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 29 Nov 2016 10:51:20 +0100 Subject: FULLPIPE: Unstub setSceneMusicParameters() --- engines/fullpipe/sound.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'engines/fullpipe') diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index 504ea0c1ae..d52d8dc4ec 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -248,13 +248,10 @@ void Sound::stop() { } void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) { - warning("STUB: FullpipeEngine::setSceneMusicParameters()"); stopSoundStream2(); -#if 0 - if (soundStream3) - FSOUND_Stream_Stop(soundStream4); -#endif + if (_mixer->isSoundHandleActive(*_soundStream3)) + _mixer->stopHandle(*_soundStream4); if (_musicLocal) stopAllSoundStreams(); @@ -419,13 +416,10 @@ void FullpipeEngine::playSound(int id, int flag) { } void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed) { - warning("STUB: FullpipeEngine::playTrack(var, %s, %d)", name, delayed); - stopSoundStream2(); + if (_mixer->isSoundHandleActive(*_soundStream3)) + _mixer->stopHandle(*_soundStream4); -#if 0 - if (soundStream3) - FSOUND_Stream_Stop(soundStream4); -#endif + stopSoundStream2(); if (_musicLocal) stopAllSoundStreams(); -- cgit v1.2.3