[Scummvm-cvs-logs] SF.net SVN: scummvm:[55410] scummvm/trunk/graphics/video/coktel_decoder.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat Jan 22 09:00:57 CET 2011


Revision: 55410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55410&view=rev
Author:   drmccoy
Date:     2011-01-22 08:00:57 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
VIDEO: Seek a video seek glitch

Observable when ESCing a 16bit or 24bit video, for example
the fuses in Urban Runner's Labyrinth screen.

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktel_decoder.cpp

Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp	2011-01-22 07:20:16 UTC (rev 55409)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp	2011-01-22 08:00:57 UTC (rev 55410)
@@ -1559,12 +1559,25 @@
 		_audioStream = Audio::makeQueuingAudioStream(_soundFreq, _soundStereo != 0);
 	}
 
+	_subtitle = -1;
+
+	if ((_blitMode > 0) && (_flags & 0x4000)) {
+		if (_curFrame > frame) {
+			_stream->seek(_frames[0].offset);
+			_curFrame = -1;
+		}
+
+		while (frame > _curFrame)
+			decodeNextFrame();
+
+		return true;
+	}
+
 	// Seek
 	_stream->seek(_frames[frame + 1].offset);
 	_curFrame = frame;
 	_startTime = g_system->getMillis() - ((frame + 2) * getStaticTimeToNextFrame());
 
-	_subtitle = -1;
 
 	return true;
 }


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