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

[knakos at users.sourceforge.net]

Revision: 42419
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42419&view=rev
Author:   knakos
Date:     2009-07-12 15:59:27 +0000 (Sun, 12 Jul 2009)

Log Message:
-----------
Apply patch 2802544: WINCE: Implement OSystem::engineInit to remove hack

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

Property Changed:
----------------
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-07-12 14:29:59 UTC (rev 42418)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-07-12 15:59:27 UTC (rev 42419)
@@ -908,18 +908,13 @@
 	return _sampleRate;
 }
 
-void OSystem_WINCE3::setWindowCaption(const char *caption) {
+void OSystem_WINCE3::engineInit() {
 	check_mappings(); // called here to initialize virtual keys handling
 
 	//update_game_settings();
 	// finalize mixer init
 	compute_sample_rate();
 	setupMixer();
-
-FIXME: move check_mappings() etc. calls to engineInit() & engineDone()
-
-	// handle the actual event
-	OSystem_SDL::setWindowCaption(caption);
 }
 
 bool OSystem_WINCE3::openCD(int drive) {


Property changes on: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
___________________________________________________________________
Added: svn:executable
   + *

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-07-12 14:29:59 UTC (rev 42418)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-07-12 15:59:27 UTC (rev 42419)
@@ -84,7 +84,7 @@
 	// Overloaded from SDL backend (master volume and sample rate subtleties)
 	void setupMixer();
 	// Overloaded from OSystem
-	//void engineInit();
+	void engineInit();
 	void getTimeAndDate(struct tm &t) const;
 	virtual Common::SeekableReadStream *createConfigReadStream();
 	virtual Common::WriteStream *createConfigWriteStream();
@@ -145,7 +145,6 @@
 	//int getGraphicsMode() const;
 	int getDefaultGraphicsMode() const;
 
-	void setWindowCaption(const char *caption);
 	bool openCD(int drive);
 	int getOutputSampleRate() const;
 


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