[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.436,1.437

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10820/scumm

Modified Files:
	sound.cpp 
Log Message:
Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- sound.cpp	4 Apr 2005 11:58:42 -0000	1.436
+++ sound.cpp	4 Apr 2005 17:42:49 -0000	1.437
@@ -849,11 +849,7 @@
 			else if (_vm->_imuse)
 				return (_vm->_imuse->getSoundStatus(sound));
 		} else if (sound >= 10000) {
-			int channel = sound - 10000;
-			if (_vm->_mixer->isSoundHandleActive(_heSoundChannels[channel]))
-				return _vm->_mixer->getActiveChannelSoundID(_heSoundChannels[channel]);
-			else
-				return 0;
+			return _vm->_mixer->getSoundID(_heSoundChannels[sound - 10000]);
 		}
 	}