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

[m_kiewitz at users.sourceforge.net]

Revision: 51017
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51017&view=rev
Author:   m_kiewitz
Date:     2010-07-19 07:29:17 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
SCI: change kDoSound(updateCues) for samples

only set signal when sample was/is playing, fixes qfg2 genie intro

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

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-19 05:36:10 UTC (rev 51016)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-19 07:29:17 UTC (rev 51017)
@@ -379,10 +379,12 @@
 			musicSlot->loop -= currentLoopCounter - musicSlot->sampleLoopCounter;
 			musicSlot->sampleLoopCounter = currentLoopCounter;
 		}
-		if ((!_music->soundIsActive(musicSlot)) && (musicSlot->status != kSoundPaused)) {
-			processStopSound(obj, true);
-		} else {
-			_music->updateAudioStreamTicker(musicSlot);
+		if (musicSlot->status == kSoundPlaying) {
+			if (!_music->soundIsActive(musicSlot)) {
+				processStopSound(obj, true);
+			} else {
+				_music->updateAudioStreamTicker(musicSlot);
+			}
 		}
 		// We get a flag from MusicEntry::doFade() here to set volume for the stream
 		if (musicSlot->fadeSetVolume) {


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