[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.h,1.37,1.37.2.1 smush_player.cpp,1.138,1.138.2.1

Nicolas Bacca arisme at users.sourceforge.net
Mon Dec 20 15:23:03 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23839

Modified Files:
      Tag: branch-0-7-0
	smush_player.h smush_player.cpp 
Log Message:
WinCE workaround to limit issues if the decoding is too slow

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- smush_player.h	27 Nov 2004 17:09:05 -0000	1.37
+++ smush_player.h	20 Dec 2004 23:22:23 -0000	1.37.2.1
@@ -77,6 +77,9 @@
 	bool _insanity;
 	bool _middleAudio;
 	bool _skipPalette;
+#ifdef _WIN32_WCE
+	bool _inTimer;
+#endif
 
 public:
 	SmushPlayer(ScummEngine_v6 *scumm, int speed);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.138
retrieving revision 1.138.2.1
diff -u -d -r1.138 -r1.138.2.1
--- smush_player.cpp	27 Nov 2004 17:09:05 -0000	1.138
+++ smush_player.cpp	20 Dec 2004 23:22:23 -0000	1.138.2.1
@@ -216,6 +216,9 @@
 
 void SmushPlayer::timerCallback(void *refCon) {
 	((SmushPlayer *)refCon)->parseNextFrame();
+#ifdef _WIN32_WCE
+	((SmushPlayer *)refCon)->_inTimer = true;
+#endif
 }
 
 SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
@@ -247,6 +250,9 @@
 	_insanity = false;
 	_middleAudio = false;
 	_skipPalette = false;
+#ifdef _WIN32_WCE
+	_inTimer = false;
+#endif
 }
 
 SmushPlayer::~SmushPlayer() {
@@ -931,7 +937,12 @@
 
 	end_time = _vm->_system->getMillis();
 
+#ifdef _WIN32_WCE
+	if (!_inTimer)
+		updateScreen();
+#else
 	updateScreen();
+#endif
 	_smixer->handleFrame();
 
 	debugC(DEBUG_SMUSH, "Smush stats: FRME( %03d ), Limit(%d)", end_time - start_time, _speed / 1000);
@@ -1209,6 +1220,9 @@
 			start_time = _vm->_system->getMillis();
 			_vm->_system->updateScreen();
 			_updateNeeded = false;
+#ifdef _WIN32_WCE
+			_inTimer = false;
+#endif
 
 			end_time = _vm->_system->getMillis();
 





More information about the Scummvm-git-logs mailing list