[Scummvm-cvs-logs] SF.net SVN: scummvm: [32276] scummvm/trunk/engines/gob/coktelvideo.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Mon May 26 07:17:21 CEST 2008


Revision: 32276
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32276&view=rev
Author:   drmccoy
Date:     2008-05-25 22:17:21 -0700 (Sun, 25 May 2008)

Log Message:
-----------
Ooops, made frame skipping for A/V sync correction work again (instead of locking up)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/coktelvideo.cpp

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2008-05-26 00:28:48 UTC (rev 32275)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2008-05-26 05:17:21 UTC (rev 32276)
@@ -326,11 +326,11 @@
 			return;
 
 		if (_skipFrames == 0) {
-			int32 waitTime = ((_curFrame * _soundSliceLength) -
-				((g_system->getMillis() - _soundStartTime) << 16)) >> 16;
+			int32 waitTime = (int16) (((_curFrame * _soundSliceLength) -
+				((g_system->getMillis() - _soundStartTime) << 16)) >> 16);
 
 			if (waitTime < 0) {
-				_skipFrames = -waitTime / _soundSliceLength;
+				_skipFrames = -waitTime / (_soundSliceLength >> 16);
 				warning("Video A/V sync broken, skipping %d frame(s)", _skipFrames + 1);
 			} else if (waitTime > 0)
 				g_system->delayMillis(waitTime);


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




More information about the Scummvm-git-logs mailing list