[Scummvm-cvs-logs] SF.net SVN: scummvm: [22176] scummvm/trunk/engines/scumm/he/sound_he.cpp

[kirben at users.sourceforge.net]

Revision: 22176
Author:   kirben
Date:     2006-04-26 03:34:34 -0700 (Wed, 26 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22176&view=rev

Log Message:
-----------
isSoundRunning always returns sound id in HE games

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/sound_he.cpp
Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp	2006-04-26 09:04:51 UTC (rev 22175)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp	2006-04-26 10:34:34 UTC (rev 22176)
@@ -123,7 +123,16 @@
 		}
 	}
 
-	return Sound::isSoundRunning(sound);
+	if (_vm->_mixer->isSoundIDActive(sound))
+		return sound;
+
+	if (isSoundInQueue(sound))
+		return sound;
+
+	if (_vm->_musicEngine &&_vm->_musicEngine->getSoundStatus(sound))
+		return sound;
+
+	return 0;
 }
 
 void SoundHE::stopSound(int sound) {


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