[Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.10,1.11 gmidi.cpp,1.12,1.13 imuse.cpp,1.19,1.20

[Ludvig Strigeus]

Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv4300/sound

Modified Files:
	adlib.cpp gmidi.cpp imuse.cpp 
Log Message:
new video engine (expect broken non-sdl builds),
simon the sorcerer 1 & 2 support (non SCUMM games)

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adlib.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** adlib.cpp	11 Apr 2002 17:19:15 -0000	1.10
--- adlib.cpp	12 Apr 2002 21:26:35 -0000	1.11
***************
*** 114,118 ****
  }
  
! void AdlibSoundDriver::init(SoundEngine *eng)
  {
  	int i;
--- 114,118 ----
  }
  
! void AdlibSoundDriver::init(SoundEngine *eng, OSystem *syst)
  {
  	int i;

Index: gmidi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/gmidi.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gmidi.cpp	11 Apr 2002 17:19:15 -0000	1.12
--- gmidi.cpp	12 Apr 2002 21:26:35 -0000	1.13
***************
*** 524,532 ****
  }
  
! void MidiSoundDriver::init(SoundEngine *eng)
  {
  	int i;
  	MidiChannelGM *mc;
  
  	_se = eng;
  
--- 524,553 ----
  }
  
! int MidiSoundDriver::midi_driver_thread(void *param) {
! 	MidiSoundDriver *mid = (MidiSoundDriver*) param;
! 	int old_time, cur_time;
! 
! 	old_time = mid->_system->get_msecs();
! 
! 	for(;;) {
! 		mid->_system->delay_msecs(10);
! 
! 		cur_time = mid->_system->get_msecs();
! 		while (old_time < cur_time) {
! 			old_time += 10;
! 			mid->_se->on_timer();
! 		}
! 	}
! }
! 
! void MidiSoundDriver::init(SoundEngine *eng, OSystem *syst)
  {
  	int i;
  	MidiChannelGM *mc;
  
+ 	_system = syst;
+ 
+ 	/* Install the on_timer thread */
+ 	syst->create_thread(midi_driver_thread, this);
  	_se = eng;
  

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** imuse.cpp	11 Apr 2002 17:19:15 -0000	1.19
--- imuse.cpp	12 Apr 2002 21:26:35 -0000	1.20
***************
*** 1000,1004 ****
  	init_parts();
  
! 	_driver->init(this);
  
  	_initialized = true;
--- 1000,1004 ----
  	init_parts();
  
! 	_driver->init(this, scumm->_system);
  
  	_initialized = true;