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

[m_kiewitz at users.sourceforge.net]

Revision: 49158
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49158&view=rev
Author:   m_kiewitz
Date:     2010-05-23 16:42:49 +0000 (Sun, 23 May 2010)

Log Message:
-----------
SCI: reenabling "stopAllSounds" code disabled in r49101 - isn't called anymore since priority is honored so it may have been right after all

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-05-23 13:22:58 UTC (rev 49157)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-23 16:42:49 UTC (rev 49158)
@@ -927,11 +927,6 @@
 #ifndef USE_OLD_MUSIC_FUNCTIONS
 	Common::StackLock(_music->_mutex);
 
-	// FIXME: this can't be right, it's called in iceman (room 14) when the door sound has done playing
-	//         stopping sounds can't be right, because music is starting afterwards in ssci. can't be resume queued
-	//         song(s), because music is playing even when this call is nuked inside ssci.
-	return;
-
 	const MusicList::iterator end = _music->getPlayListEnd();
 	for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
 		if (_soundVersion <= SCI_VERSION_0_LATE) {


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