[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.9,2.10

Ruediger Hanke tomjoad at users.sourceforge.net
Wed Dec 25 04:35:06 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10416

Modified Files:
	imuse.cpp 
Log Message:
Fix midi driver thread for MorphOS

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- imuse.cpp	25 Dec 2002 00:38:52 -0000	2.9
+++ imuse.cpp	25 Dec 2002 12:34:50 -0000	2.10
@@ -3525,51 +3525,6 @@
 	}
 }
 
-#if !defined(__MORPHOS__)
-#else
-#include <proto/exec.h>
-#include <proto/dos.h>
-#include "morphos.h"
-#include "morphos_sound.h"
-int IMuseDriver::midi_driver_thread(void *param)
-{
-	IMuseDriver *mid = (IMuseDriver *) 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 = mid->_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 = mid->_system->get_msecs();
-			while (old_time < cur_time) {
-				old_time += 10;
-				mid->_se->on_timer();
-			}
-		}
-	}
-
-	ReleaseSemaphore(&ScummMusicThreadRunning);
-	RemTask(NULL);
-	return 0;
-}
-#endif
-
 void IMuseDriver::init(IMuseInternal *eng, OSystem *syst)
 {
 	int i;





More information about the Scummvm-git-logs mailing list