[Scummvm-cvs-logs] CVS: scummvm/morphos morphos.cpp,1.6,1.7 morphos_sound.cpp,1.4,1.5

[Ludvig Strigeus]

Update of /cvsroot/scummvm/scummvm/morphos
In directory usw-pr-cvs1:/tmp/cvs-serv31838/morphos

Modified Files:
	morphos.cpp morphos_sound.cpp 
Log Message:
wrote new mixer class,
cleaned up sound header files,
integrated mixer into scummvm & simon


Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** morphos.cpp	12 Apr 2002 21:26:35 -0000	1.6
--- morphos.cpp	14 Apr 2002 18:13:08 -0000	1.7
***************
*** 65,69 ****
  GameDetector detector;
  
! SoundEngine sound;
  SOUND_DRIVER_TYPE snd_driv;
  
--- 65,69 ----
  GameDetector detector;
  
! IMuse sound;
  SOUND_DRIVER_TYPE snd_driv;
  
***************
*** 1880,1884 ****
  	scumm->_gameDataPath = detector._gameDataPath;
  	scumm->_gameTempo = detector._gameTempo;
- 	scumm->_soundEngine = detector._soundEngine;
  	scumm->_videoMode = detector._videoMode;
  	scumm->_exe_name = detector._exe_name;
--- 1880,1883 ----

Index: morphos_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos_sound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** morphos_sound.cpp	10 Apr 2002 20:48:27 -0000	1.4
--- morphos_sound.cpp	14 Apr 2002 18:13:08 -0000	1.5
***************
*** 41,45 ****
  extern int GetTicks();
  extern Scumm scumm;
! extern SoundEngine sound;
  extern SOUND_DRIVER_TYPE snd_driv;
  
--- 41,45 ----
  extern int GetTicks();
  extern Scumm scumm;
! extern IMuse sound;
  extern SOUND_DRIVER_TYPE snd_driv;