[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.10.2.1,1.10.2.2
Nicolas Bacca
arisme at users.sourceforge.net
Sun Feb 22 10:18:02 CET 2004
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19746/sword1
Modified Files:
Tag: branch-0-6-0
animation.cpp
Log Message:
Avoid deadlock in MPEG-2 cutscenes + slow devices
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- animation.cpp 15 Feb 2004 14:16:33 -0000 1.10.2.1
+++ animation.cpp 22 Feb 2004 18:04:25 -0000 1.10.2.2
@@ -318,6 +318,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) ||
((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {
More information about the Scummvm-git-logs
mailing list