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, 6 insertions, 6 deletions

diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index 88527fef32..1d529e25bd 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -56,7 +56,7 @@ void OSystem_GP32::set_palette(const byte *colors, uint start, uint num) {
 
 // Set the size of the video bitmap.
 // Typically, 320x200
-void OSystem_GP32::init_size(uint w, uint h) { 
+void OSystem_GP32::initSize(uint w, uint h) { 
 	// Avoid redundant res changes
 	if ((int)w == _screenWidth && (int)h == _screenHeight)
 		return;
@@ -976,11 +976,11 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 // Set the function to be invoked whenever samples need to be generated
 // Format is the sample type format.
 // Only 16-bit signed mode is needed for simon & scumm
-bool OSystem_GP32::set_sound_proc(SoundProc proc, void *param, SoundFormat format) { 
+bool OSystem_GP32::setSoundCallback(SoundProc proc, void *param) { 
 	return false; 
 }
 
-void OSystem_GP32::clear_sound_proc() {
+void OSystem_GP32::clearSoundCallback() {
 	//_sound_proc = NULL;
 	//_sound_proc_param = NULL;
 }
diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h
index 0faf3f0cf2..2b692f0493 100644
--- a/backends/gp32/gp32.h
+++ b/backends/gp32/gp32.h
@@ -39,7 +39,7 @@ public:
 
 	// Set the size of the video bitmap.
 	// Typically, 320x200
-	void init_size(uint w, uint h);
+	void initSize(uint w, uint h);
 	int16 get_height() { return _screenHeight; }
 	int16 get_width() { return _screenWidth; }
 	
@@ -80,8 +80,8 @@ public:
 	// Set the function to be invoked whenever samples need to be generated
 	// Format is the sample type format.
 	// Only 16-bit signed mode is needed for simon & scumm
-	bool set_sound_proc(SoundProc proc, void *param, SoundFormat format);
-	void clear_sound_proc();
+	bool setSoundCallback(SoundProc proc, void *param);
+	void clearSoundCallback();
 	
 	// Get or set a property
 	uint32 property(int param, Property *value);