[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.31,1.31.2.1

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv4378

Modified Files:
      Tag: branch-0-3-0
	mididrv.cpp 
Log Message:
MorphOS: Account for moved midi_driver_thread method

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- mididrv.cpp	30 Nov 2002 01:15:48 -0000	1.31
+++ mididrv.cpp	5 Dec 2002 23:57:15 -0000	1.31.2.1
@@ -162,6 +162,7 @@
 	}
 }
 
+#if !defined(__MORPHOS__)
 int MidiDriver_MPU401::midi_driver_thread(void *param)
 {
 	MidiDriver_MPU401 *mid = (MidiDriver_MPU401 *)param;
@@ -185,7 +186,53 @@
 
 	return 0;
 }
+#else
+#include <proto/exec.h>
+#include <proto/dos.h>
+#include "morphos.h"
+#include "morphos_sound.h"
+int MidiDriver_MPU401::midi_driver_thread(void *param)
+{
+	MidiDriver_MPU401 *mid = (MidiDriver_MPU401 *)param;
+	int old_time, cur_time;
+	MsgPort *music_timer_port = NULL;
+	timerequest *music_timer_request = NULL;
 
+	ObtainSemaphore(&ScummMusicThreadRunning);
+
+	if (!OSystem_MorphOS::OpenATimer(&music_timer_port, (IORequest **) &music_timer_request, UNIT_MICROHZ, false)) {
+		warning("Could not open a timer - music will not play");
+		Wait(SIGBREAKF_CTRL_C);
+	}
+	else {
+		old_time = g_system->get_msecs();
+
+		for (;;) {
+			music_timer_request->tr_node.io_Command = TR_ADDREQUEST;
+			music_timer_request->tr_time.tv_secs = 0;
+			music_timer_request->tr_time.tv_micro = 10000;
+			DoIO((struct IORequest *)music_timer_request);
+
+			if (CheckSignal(SIGBREAKF_CTRL_C))
+				break;
+
+			cur_time = g_system->get_msecs();
+			while (old_time < cur_time) {
+				old_time += 10;
+				// Don't use mid->_se_on_timer()
+				// We must come in through IMuseMonitor to protect
+				// against conflicts with script access to IMuse.
+				if (mid->_timer_proc)
+					(*(mid->_timer_proc)) (mid->_timer_param);
+			}
+		}
+	}
+
+	ReleaseSemaphore(&ScummMusicThreadRunning);
+	RemTask(NULL);
+	return 0;
+}
+#endif
 
 
 // FIXME - the following disables reverb support in the QuickTime / CoreAudio