[Scummvm-cvs-logs] SF.net SVN: scummvm:[33991] scummvm/trunk
knakos at users.sourceforge.net
knakos at users.sourceforge.net
Mon Aug 18 19:24:28 CEST 2008
Revision: 33991
http://scummvm.svn.sourceforge.net/scummvm/?rev=33991&view=rev
Author: knakos
Date: 2008-08-18 17:24:25 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
do away with the smush force redraw hack
Modified Paths:
--------------
scummvm/trunk/backends/platform/wince/README-WinCE.txt
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/smush/smush_player.h
Modified: scummvm/trunk/backends/platform/wince/README-WinCE.txt
===================================================================
--- scummvm/trunk/backends/platform/wince/README-WinCE.txt 2008-08-18 15:13:55 UTC (rev 33990)
+++ scummvm/trunk/backends/platform/wince/README-WinCE.txt 2008-08-18 17:24:25 UTC (rev 33991)
@@ -300,12 +300,6 @@
stuttering try setting this to a higher value.
Set to 0 if your device is fast enough or if
you prefer better audio/video synchronization.
- * Smush_force_redraw int Force a Smush frame redraw every X missed
- frames. Mainly used for Full Throttle action
- sequences. Setting it lower gives more
- priority to screen redraws. Setting it higher
- gives more priority to stylus/keyboard input.
- The default is 30.
Game specific sections (f.e. [monkey2]) - game options
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-08-18 15:13:55 UTC (rev 33990)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-08-18 17:24:25 UTC (rev 33991)
@@ -1059,12 +1059,6 @@
panel->setVisible(false);
_saveToolbarState = true;
-
- // Set Smush Force Redraw rate for Full Throttle
- if (!ConfMan.hasKey("Smush_force_redraw")) {
- ConfMan.setInt("Smush_force_redraw", 30);
- ConfMan.flushToDisk();
- }
}
compute_sample_rate();
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2008-08-18 15:13:55 UTC (rev 33990)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2008-08-18 17:24:25 UTC (rev 33991)
@@ -212,10 +212,6 @@
void SmushPlayer::timerCallback() {
parseNextFrame();
-#ifdef _WIN32_WCE
- _inTimer = true;
- _inTimerCount++;
-#endif
}
SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) {
@@ -252,11 +248,6 @@
_paused = false;
_pauseStartTime = 0;
_pauseTime = 0;
-#ifdef _WIN32_WCE
- _inTimer = false;
- _inTimerCount = 0;
- _inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw");
-#endif
}
SmushPlayer::~SmushPlayer() {
@@ -926,14 +917,7 @@
}
if (_width != 0 && _height != 0) {
-#ifdef _WIN32_WCE
- if (!_inTimer || _inTimerCount == _inTimerCountRedraw) {
- updateScreen();
- _inTimerCount = 0;
- }
-#else
updateScreen();
-#endif
}
_smixer->handleFrame();
@@ -1326,10 +1310,6 @@
_vm->_system->updateScreen();
_updateNeeded = false;
}
-#ifdef _WIN32_WCE
- _inTimer = false;
- _inTimerCount = 0;
-#endif
}
if (_endOfFile)
break;
Modified: scummvm/trunk/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.h 2008-08-18 15:13:55 UTC (rev 33990)
+++ scummvm/trunk/engines/scumm/smush/smush_player.h 2008-08-18 17:24:25 UTC (rev 33991)
@@ -84,11 +84,6 @@
bool _insanity;
bool _middleAudio;
bool _skipPalette;
-#ifdef _WIN32_WCE
- bool _inTimer;
- int16 _inTimerCount;
- int16 _inTimerCountRedraw;
-#endif
public:
SmushPlayer(ScummEngine_v7 *scumm);
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