aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-03 18:43:17 +0000
committerFilippos Karapetis2010-01-03 18:43:17 +0000
commit870c99b4d437d997e9f4fb3b2a8d760c6409a05b (patch)
tree7ed0d59ed7f8f96f85d07f966208b8baf89439c1 /engines
parent1b6b4c5c085ea1e359dbfeef3aacc320dcdca536 (diff)
downloadscummvm-rg350-870c99b4d437d997e9f4fb3b2a8d760c6409a05b.tar.gz
scummvm-rg350-870c99b4d437d997e9f4fb3b2a8d760c6409a05b.tar.bz2
scummvm-rg350-870c99b4d437d997e9f4fb3b2a8d760c6409a05b.zip
SCI/new music code: Only reference the mixer for music slots which actually contain digital audio data
svn-id: r46939
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sfx/soundcmd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index a7424c0136..bdb621416e 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -769,10 +769,10 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
return;
}
- // Update digital sound effect slots here
- Audio::Mixer *mixer = g_system->getMixer();
-
if (musicSlot->pStreamAud) {
+ // Update digital sound effect slots here
+ Audio::Mixer *mixer = g_system->getMixer();
+
uint currentLoopCounter = musicSlot->pStreamAud->getNumPlayedLoops();
if (currentLoopCounter != musicSlot->sampleLoopCounter) {
// during last time we looped at least one time, update loop accordingly