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

svn-id: r13036

2 files changed, 5 insertions, 5 deletions

diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index df2dbe574c..6fb88a4948 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -219,7 +219,7 @@ void OSystem_WINCE3::get_sample_rate() {
 #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::update_game_settings() {
 	}
 }
 
-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 @@ void OSystem_WINCE3::init_size(uint w, uint h) {
 	else
 		_toolbarHandler.setOffset(400);	
 
-	OSystem_SDL_Common::init_size(w, h);	
+	OSystem_SDL_Common::initSize(w, h);	
 
 	update_game_settings();
 
diff --git a/backends/wince/wince-sdl.h b/backends/wince/wince-sdl.h
index 81c0bb2c26..a8e131f5cd 100644
--- a/backends/wince/wince-sdl.h
+++ b/backends/wince/wince-sdl.h
@@ -46,7 +46,7 @@ public:
 	// 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 @@ public:
 	// 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();