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

[drmccoy at users.sourceforge.net]

Revision: 55421
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55421&view=rev
Author:   drmccoy
Date:     2011-01-22 12:26:31 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
GOB: Fix some of the live-video glitchyness

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw.cpp
    scummvm/trunk/engines/gob/inter_v1.cpp
    scummvm/trunk/engines/gob/videoplayer.cpp
    scummvm/trunk/engines/gob/videoplayer.h

Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp	2011-01-22 12:15:42 UTC (rev 55420)
+++ scummvm/trunk/engines/gob/draw.cpp	2011-01-22 12:26:31 UTC (rev 55421)
@@ -245,6 +245,9 @@
 	if (_noInvalidated && !_applyPal)
 		return;
 
+	if (_vm->isTrueColor())
+		_applyPal = false;
+
 	if (_noInvalidated) {
 		setPalette();
 		_applyPal = false;

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2011-01-22 12:15:42 UTC (rev 55420)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2011-01-22 12:26:31 UTC (rev 55421)
@@ -45,6 +45,7 @@
 #include "gob/palanim.h"
 #include "gob/scenery.h"
 #include "gob/video.h"
+#include "gob/videoplayer.h"
 #include "gob/sound/sound.h"
 
 namespace Gob {
@@ -1189,8 +1190,10 @@
 	int16 key;
 	uint32 now;
 
-	_vm->_draw->forceBlit();
-	_vm->_video->retrace();
+	if (!_vm->_vidPlayer->isPlayingLive()) {
+		_vm->_draw->forceBlit();
+		_vm->_video->retrace();
+	}
 
 	cmd = _vm->_game->_script->readInt16();
 	animPalette();

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 12:15:42 UTC (rev 55420)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 12:26:31 UTC (rev 55421)
@@ -299,6 +299,11 @@
 	}
 }
 
+bool VideoPlayer::isPlayingLive() const {
+	const Video *video = getVideoBySlot(0);
+	return video && video->live;
+}
+
 void VideoPlayer::updateLive(bool force) {
 	Video *video = getVideoBySlot(0);
 	if (!video || !video->live)

Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h	2011-01-22 12:15:42 UTC (rev 55420)
+++ scummvm/trunk/engines/gob/videoplayer.h	2011-01-22 12:26:31 UTC (rev 55421)
@@ -112,6 +112,8 @@
 	bool play(int slot, Properties &properties);
 	void waitEndFrame(int slot, bool onlySound = false);
 
+	bool isPlayingLive() const;
+
 	void updateLive(bool force = false);
 
 	bool slotIsOpen(int slot = 0) const;


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