libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 08:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed two race conditions

Browse Source 
svn-id: r5490
This commit is contained in:
Max Horn 2002-11-10 14:49:49 +00:00
parent 08c80c4e98
commit 54aa3f898d
1 changed files with 11 additions and 4 deletions

15
scumm/imuse.cpp

@ -4793,8 +4793,12 @@ void IMuseGM::part_key_off(Part *part, byte note)
#if !defined(__MORPHOS__)
int IMuseGM::midi_driver_thread(void *param)
{
IMuseGM *mid = (IMuseGM *) param;
IMuseGM *mid = (IMuseGM *)param;
int old_time, cur_time;
// Avoid race condition
if (NULL == g_scumm->_imuse);
return 0;
old_time = mid->_system->get_msecs();
@ -4804,7 +4808,8 @@ int IMuseGM::midi_driver_thread(void *param)
cur_time = mid->_system->get_msecs();
while (old_time < cur_time) {
old_time += 10;
//mid->_se->on_timer();
// We can't use this here: mid->_se->on_timer() according to Jamieson630,
// because we have to go through the IMuseMonitor...
g_scumm->_imuse->on_timer();
}
}
@ -5043,8 +5048,10 @@ IMuse *IMuse::create(OSystem *syst, MidiDriver *midi, SoundMixer *mixer)
* IMUSE Digital Implementation, for SCUMM v7 and higher.
*/
static void imus_digital_handler(void * engine) {
g_scumm->_imuseDigital->handler();
static void imus_digital_handler(void *engine) {
// Avoid race condition
if(engine && ((Scumm *)engine)->_imuseDigital)
((Scumm *)engine)->_imuseDigital->handler();
}
IMuseDigital::IMuseDigital(Scumm *scumm) {