diff options
| author | Ludvig Strigeus | 2002-04-14 18:13:08 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2002-04-14 18:13:08 +0000 |
| commit | ac62a7cb2e17a86350681366d768a99db3b9845d (patch) | |
| tree | 48a6f9eca1242f7ebf03f05835372811a4048f7a /mac | |
| parent | a5e3dbb85dad96d8ffb6205e07d12ff8396ba5c7 (diff) | |
| download | scummvm-rg350-ac62a7cb2e17a86350681366d768a99db3b9845d.tar.gz scummvm-rg350-ac62a7cb2e17a86350681366d768a99db3b9845d.tar.bz2 scummvm-rg350-ac62a7cb2e17a86350681366d768a99db3b9845d.zip | |
wrote new mixer class,
cleaned up sound header files,
integrated mixer into scummvm & simon
svn-id: r3937
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/mac.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mac/mac.cpp b/mac/mac.cpp index 0704eafbb2..c43cf5dae8 100644 --- a/mac/mac.cpp +++ b/mac/mac.cpp @@ -31,7 +31,6 @@ #include "stdafx.h" #include "scumm.h" #include "gui.h" -#include "sound.h" #include "cdmusic.h" #include "mp3_cd.h" #include "gameDetector.h" @@ -138,7 +137,7 @@ int sel; Scumm *scumm; ScummDebugger debugger; Gui gui; -SoundEngine sound; +IMuse sound; SOUND_DRIVER_TYPE snd_driv; OSystem _system; GameDetector detector; @@ -1025,7 +1024,6 @@ void InitScummStuff() scumm->_scale = detector._scale; scumm->_gameDataPath = detector._gameDataPath; scumm->_gameTempo = detector._gameTempo; - scumm->_soundEngine = detector._soundEngine; scumm->_videoMode = detector._videoMode; scumm->_exe_name = detector._exe_name; scumm->_gameId = detector._gameId; |