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 /morphos/morphos.cpp | |
| 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 'morphos/morphos.cpp')
| -rw-r--r-- | morphos/morphos.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/morphos/morphos.cpp b/morphos/morphos.cpp index 7f45eaabb2..e8e30418a0 100644 --- a/morphos/morphos.cpp +++ b/morphos/morphos.cpp @@ -64,7 +64,7 @@ Gui gui; OSystem _system; GameDetector detector; -SoundEngine sound; +IMuse sound; SOUND_DRIVER_TYPE snd_driv; typedef void (*ScalerFunc)( uint32 src_x, uint32 src_y, uint32 dest_x, uint32 dest_y, uint32 width, uint32 height ); @@ -1879,7 +1879,6 @@ int main( int argc, char *argv[] ) 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; |