[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.24,1.25

Nicolas Bacca arisme at users.sourceforge.net
Sun Feb 22 10:27:08 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21905/sword2/driver

Modified Files:
	animation.cpp 
Log Message:
Avoid deadlock in MPEG-2 cutscenes + slow devices

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- animation.cpp	22 Feb 2004 14:11:12 -0000	1.24
+++ animation.cpp	22 Feb 2004 18:13:54 -0000	1.25
@@ -352,6 +352,10 @@
 				 * frames if we run behind and delaying if we are too fast
 				 */
 
+				/* Avoid deadlock is sound was too far ahead */
+				if (bgSoundStream && !bgSound.isActive())
+					return false;
+
 #ifdef BACKEND_8BIT
 				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
 					((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {





More information about the Scummvm-git-logs mailing list