[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.7,1.8 wince-sdl.h,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Tue Feb 24 14:55:22 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12241/backends/wince

Modified Files:
	wince-sdl.cpp wince-sdl.h 
Log Message:
the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wince-sdl.cpp	24 Feb 2004 22:17:08 -0000	1.7
+++ wince-sdl.cpp	24 Feb 2004 22:39:37 -0000	1.8
@@ -219,7 +219,7 @@
 #endif
 }
 
-bool OSystem_WINCE3::set_sound_proc(SoundProc proc, void *param, SoundFormat format) {
+bool OSystem_WINCE3::setSoundCallback(SoundProc proc, void *param) {
 	SDL_AudioSpec desired;
 	int thread_priority;
 
@@ -322,7 +322,7 @@
 	}
 }
 
-void OSystem_WINCE3::init_size(uint w, uint h) {
+void OSystem_WINCE3::initSize(uint w, uint h) {
 	if (w == 320 && h == 200)
 		h = 240; // use the extra 40 pixels height for the toolbar
 
@@ -333,7 +333,7 @@
 	else
 		_toolbarHandler.setOffset(400);	
 
-	OSystem_SDL_Common::init_size(w, h);	
+	OSystem_SDL_Common::initSize(w, h);	
 
 	update_game_settings();
 

Index: wince-sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wince-sdl.h	28 Jan 2004 01:12:48 -0000	1.3
+++ wince-sdl.h	24 Feb 2004 22:39:37 -0000	1.4
@@ -46,7 +46,7 @@
 	// Set a parameter
 	uint32 property(int param, Property *value);
 
-	void init_size(uint w, uint h);
+	void initSize(uint w, uint h);
 
 	// Overloaded from SDL_Common (toolbar handling)
 	bool poll_event(Event *event);
@@ -61,7 +61,7 @@
 	// Overloaded from SDL_Commmon
 	void quit();
 	// Overloaded from SDL_Commmon (master volume and sample rate subtleties)
-	bool set_sound_proc(SoundProc proc, void *param, SoundFormat format);
+	bool setSoundCallback(SoundProc proc, void *param);
 
 	// GUI and action stuff
 	void swap_panel_visibility();





More information about the Scummvm-git-logs mailing list