[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.23,1.24 morphos.h,1.13,1.14

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory sc8-pr-cvs1:/tmp/cvs-serv13893

Modified Files:
	morphos.cpp morphos.h 
Log Message:
Implement new interface functions

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- morphos.cpp	29 May 2003 22:34:33 -0000	1.23
+++ morphos.cpp	5 Jul 2003 09:08:38 -0000	1.24
@@ -343,6 +343,8 @@
 
 uint32 OSystem_MorphOS::property(int param, Property *value)
 {
+	AUTO_LOCK
+
 	switch (param)
 	{
 		case PROP_TOGGLE_FULLSCREEN:
@@ -362,6 +364,7 @@
 			switch (GameID)
 			{
 				case GID_MONKEY:
+				case GID_MONKEY_SEGA:
 					ids = MonkeyCDIDs;
 					names = MonkeyNames;
 					break;
@@ -1426,6 +1429,7 @@
 	return true;
 }
 
+
 void OSystem_MorphOS::fill_sound(byte *stream, int len)
 {
 	if (SoundProc)
@@ -1434,6 +1438,17 @@
 		memset(stream, 0x0, len);
 }
 
+void OSystem_MorphOS::clear_sound_proc()
+{
+	if (ScummSoundThread)
+	{
+		Signal((Task *) ScummSoundThread, SIGBREAKF_CTRL_C);
+		ObtainSemaphore(&ScummSoundThreadRunning);	 /* Wait for thread to finish */
+		ReleaseSemaphore(&ScummSoundThreadRunning);
+		ScummSoundThread = NULL;
+	}
+}
+
 void OSystem_MorphOS::init_size(uint w, uint h)
 {
 	if (ScummBuffer)
@@ -1509,6 +1524,16 @@
 	}
 
 	CreateScreen(CSDSPTYPE_KEEP);
+}
+
+int16 OSystem_MorphOS::get_width()
+{
+	return ScummScrWidth;
+}
+
+int16 OSystem_MorphOS::get_height()
+{
+	return ScummScrHeight;
 }
 
 void OSystem_MorphOS::show_overlay()

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- morphos.h	29 May 2003 22:34:33 -0000	1.13
+++ morphos.h	5 Jul 2003 09:08:38 -0000	1.14
@@ -72,6 +72,8 @@
 		virtual void clear_overlay();
 		virtual void grab_overlay(int16 *buf, int pitch);
 		virtual void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+		virtual int16 get_height();
+		virtual int16 get_width();
 
 		// Get the number of milliseconds since the program was started.
 		virtual uint32 get_msecs();
@@ -101,6 +103,7 @@
 		// Set the function to be invoked whenever samples need to be generated
 		virtual bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 				  void fill_sound    (byte * stream, int len);
+				  void clear_sound_proc();
 
 		virtual uint32 property(int param, Property *value);