[Scummvm-cvs-logs] SF.net SVN: scummvm:[35728] scummvm/trunk/backends/platform

[knakos at users.sourceforge.net]

Revision: 35728
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35728&view=rev
Author:   knakos
Date:     2009-01-04 16:07:19 +0000 (Sun, 04 Jan 2009)

Log Message:
-----------
Virtualize sdl backend's setGraphicsModeIntern() so it can be overloaded by CE. Scalers are pre-selected by magic on CE. Overriding these selections leads to crashes

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.h
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp
    scummvm/trunk/backends/platform/wince/wince-sdl.h

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2009-01-04 15:44:33 UTC (rev 35727)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2009-01-04 16:07:19 UTC (rev 35728)
@@ -275,7 +275,7 @@
 	};
 	VideoState _videoMode, _oldVideoMode;
 
-	void setGraphicsModeIntern();
+	virtual void setGraphicsModeIntern(); // overloaded by CE backend
 
 	/** Force full redraw on next updateScreen */
 	bool _forceFull;

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-01-04 15:44:33 UTC (rev 35727)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-01-04 16:07:19 UTC (rev 35728)
@@ -1135,6 +1135,11 @@
     return GFX_NORMAL;
 }
 
+void OSystem_WINCE3::setGraphicsModeIntern() {
+	// Scalers have been pre-selected for the desired mode.
+	// No further tuning required.
+}
+
 bool OSystem_WINCE3::update_scalers() {
 	if (_videoMode.mode != GFX_NORMAL)
 		return false;

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-01-04 15:44:33 UTC (rev 35727)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-01-04 16:07:19 UTC (rev 35728)
@@ -65,8 +65,8 @@
 	// Update the dirty areas of the screen
 	void internUpdateScreen();
 
+	void setGraphicsModeIntern();
 	void initSize(uint w, uint h);
-
 	void initBackend();
 
 	// Overloaded from SDL backend (toolbar handling)


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