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

[drmccoy at users.sourceforge.net]

Revision: 28604
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28604&view=rev
Author:   drmccoy
Date:     2007-08-13 17:42:32 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
The talking videos work a bit better now. The sync and coordinates are still screwy

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

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2007-08-13 23:58:17 UTC (rev 28603)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2007-08-14 00:42:32 UTC (rev 28604)
@@ -1068,9 +1068,13 @@
 			// Next sound slice data
 			if (part.flags == 1) {
 
-				if (_soundEnabled)
+				if (_soundEnabled) {
 					filledSoundSlice(part.size);
-				else
+
+					if (_soundStage == 1)
+						startSound = true;
+
+				} else
 					_stream->skip(part.size);
 
 			// Initial sound data (all slices)

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2007-08-13 23:58:17 UTC (rev 28603)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2007-08-14 00:42:32 UTC (rev 28604)
@@ -177,8 +177,12 @@
 		endFrame = lastFrame;
 	palCmd &= 0x3F;
 
-	if (_video->getCurrentFrame() != startFrame)
-		_video->seekFrame(startFrame);
+	if (_video->getCurrentFrame() != startFrame) {
+		if (_video->getFeatures() & CoktelVideo::kFeaturesSound)
+			startFrame = _video->getCurrentFrame();
+		else
+			_video->seekFrame(startFrame);
+	}
 
 	_vm->_draw->_showCursor = 0;
 	_vm->_util->setFrameRate(12);


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