[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.33,1.34 morphos.h,1.20,1.21

[Max Horn]

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

Modified Files:
	morphos.cpp morphos.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: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- morphos.cpp	4 Nov 2003 20:46:20 -0000	1.33
+++ morphos.cpp	24 Feb 2004 22:39:36 -0000	1.34
@@ -1436,13 +1436,13 @@
 	UndrawMouse();
 }
 
-bool OSystem_MorphOS::set_sound_proc(OSystem::SoundProc proc, void *param, OSystem::SoundFormat format)
+bool OSystem_MorphOS::setSoundCallback(OSystem::SoundProc proc, void *param)
 {
 	if (ScummSoundThread)
 	{
 		if (SoundProc == proc)
 			return true;
-		clear_sound_proc();
+		clearSoundCallback();
 	}
 
 	SoundProc = proc;
@@ -1479,7 +1479,7 @@
 		memset(stream, 0x0, len);
 }
 
-void OSystem_MorphOS::clear_sound_proc()
+void OSystem_MorphOS::clearSoundCallback()
 {
 	if (ScummSoundThread)
 	{
@@ -1490,7 +1490,7 @@
 	}
 }
 
-void OSystem_MorphOS::init_size(uint w, uint h)
+void OSystem_MorphOS::initSize(uint w, uint h)
 {
 	if (ScummBuffer)
 	{

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- morphos.h	27 Sep 2003 16:54:10 -0000	1.20
+++ morphos.h	24 Feb 2004 22:39:36 -0000	1.21
@@ -47,7 +47,7 @@
 
 		// Set the size of the video bitmap.
 		// Typically, 320x200
-		virtual void init_size(uint w, uint h);
+		virtual void initSize(uint w, uint h);
 
 		// Draw a bitmap to screen.
 		// The screen will not be updated to reflect the new bitmap
@@ -101,9 +101,9 @@
 		virtual void warp_mouse(int x, int y);
 
 		// Set the function to be invoked whenever samples need to be generated
-		virtual bool set_sound_proc(SoundProc proc, void *param, SoundFormat format);
+		virtual bool setSoundCallback(SoundProc proc, void *param);
 				  void fill_sound    (byte * stream, int len);
-				  void clear_sound_proc();
+				  void clearSoundCallback();
 
 		virtual uint32 property(int param, Property *value);