[Scummvm-cvs-logs] SF.net SVN: scummvm:[50766] scummvm/trunk/engines/sci/sound/music.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50766
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50766&view=rev
Author:   m_kiewitz
Date:     2010-07-09 18:35:46 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
SCI: fixing regression of r50414 - we set volume to standard levels inside initCommands since then, so if we set the actual needed volume before calling that it will get ignored - fixes lsl1demo

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-07-09 18:11:42 UTC (rev 50765)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-07-09 18:35:46 UTC (rev 50766)
@@ -374,9 +374,10 @@
 			_mutex.lock();
 			pSnd->pMidiParser->mainThreadBegin();
 			pSnd->pMidiParser->tryToOwnChannels();
+			if (pSnd->status == kSoundStopped)
+				pSnd->pMidiParser->sendInitCommands();
 			pSnd->pMidiParser->setVolume(pSnd->volume);
 			if (pSnd->status == kSoundStopped) {
-				pSnd->pMidiParser->sendInitCommands();
 				pSnd->pMidiParser->jumpToTick(0);
 			} else {
 				// Fast forward to the last position and perform associated events when loading


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