aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe
diff options
context:
space:
mode:
authorEugene Sandulenko2016-11-29 10:51:20 +0100
committerEugene Sandulenko2016-11-29 18:45:04 +0100
commita6d2feb8c462a977c39408fa28131a6daf94e7c7 (patch)
tree37700344a559d5148082306c933ff697c15fbca1 /engines/fullpipe
parent5d45f740d3be06ca6fa4167e02568f4366967768 (diff)
downloadscummvm-rg350-a6d2feb8c462a977c39408fa28131a6daf94e7c7.tar.gz
scummvm-rg350-a6d2feb8c462a977c39408fa28131a6daf94e7c7.tar.bz2
scummvm-rg350-a6d2feb8c462a977c39408fa28131a6daf94e7c7.zip
FULLPIPE: Unstub setSceneMusicParameters()
Diffstat (limited to 'engines/fullpipe')
-rw-r--r--engines/fullpipe/sound.cpp16
1 files changed, 5 insertions, 11 deletions
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();