[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.91.2.1,1.91.2.2
Ruediger Hanke
tomjoad at users.sourceforge.net
Thu Dec 5 15:57:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3827
Modified Files:
Tag: branch-0-3-0
imuse.cpp
Log Message:
MorphOS: Account for moved midi_driver_thread method
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.91.2.1
retrieving revision 1.91.2.2
diff -u -d -r1.91.2.1 -r1.91.2.2
--- imuse.cpp 5 Dec 2002 22:17:53 -0000 1.91.2.1
+++ imuse.cpp 5 Dec 2002 23:56:08 -0000 1.91.2.2
@@ -3689,51 +3689,6 @@
}
}
-#if !defined(__MORPHOS__)
-#else
-#include <proto/exec.h>
-#include <proto/dos.h>
-#include "morphos.h"
-#include "morphos_sound.h"
-int IMuseGM::midi_driver_thread(void *param)
-{
- IMuseGM *mid = (IMuseGM *) 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 IMuseGM::init(IMuseInternal *eng, OSystem *syst)
{
int i;
More information about the Scummvm-git-logs
mailing list