[Scummvm-cvs-logs] CVS: scummvm/mac mac.cpp,1.13,1.14

[Ludvig Strigeus]

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

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


Index: mac.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/mac/mac.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mac.cpp	12 Apr 2002 21:26:35 -0000	1.13
--- mac.cpp	14 Apr 2002 18:13:08 -0000	1.14
***************
*** 32,36 ****
  #include "scumm.h"
  #include "gui.h"
- #include "sound.h"
  #include "cdmusic.h"
  #include "mp3_cd.h"
--- 32,35 ----
***************
*** 139,143 ****
  ScummDebugger debugger;
  Gui gui;
! SoundEngine sound;
  SOUND_DRIVER_TYPE snd_driv;
  OSystem _system;
--- 138,142 ----
  ScummDebugger debugger;
  Gui gui;
! IMuse sound;
  SOUND_DRIVER_TYPE snd_driv;
  OSystem _system;
***************
*** 1026,1030 ****
  	scumm->_gameDataPath = detector._gameDataPath;
  	scumm->_gameTempo = detector._gameTempo;
- 	scumm->_soundEngine = detector._soundEngine;
  	scumm->_videoMode = detector._videoMode;
  	scumm->_exe_name = detector._exe_name;
--- 1025,1028 ----