[Scummvm-cvs-logs] SF.net SVN: scummvm:[46939] scummvm/trunk/engines/sci/sfx/soundcmd.cpp

[thebluegr at users.sourceforge.net]

Revision: 46939
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46939&view=rev
Author:   thebluegr
Date:     2010-01-03 18:43:17 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
SCI/new music code: Only reference the mixer for music slots which actually contain digital audio data

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-03 18:37:13 UTC (rev 46938)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-03 18:43:17 UTC (rev 46939)
@@ -769,10 +769,10 @@
 		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();
 
-	if (musicSlot->pStreamAud) {
 		uint currentLoopCounter = musicSlot->pStreamAud->getNumPlayedLoops();
 		if (currentLoopCounter != musicSlot->sampleLoopCounter) {
 			// during last time we looped at least one time, update loop accordingly


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.