diff options
| author | Max Horn | 2006-10-21 12:44:10 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-21 12:44:10 +0000 |
| commit | 9edf1e6a1a95f45b9883e298edc7e578ff9495d1 (patch) | |
| tree | 897a46c0e4bbc22c8422bd3b96545bfeea3a4a0f /sound/mididrv.cpp | |
| parent | 86d3f30347d5ee7ee67a4f16d5043b9bef0539db (diff) | |
| download | scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.gz scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.bz2 scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.zip | |
cleanup
svn-id: r24407
Diffstat (limited to 'sound/mididrv.cpp')
| -rw-r--r-- | sound/mididrv.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index ea738dba0b..8c2a64f808 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -26,6 +26,7 @@ #include "engines/engine.h" #include "common/config-manager.h" #include "common/str.h" +#include "common/system.h" #include "common/util.h" #include "sound/mididrv.h" @@ -211,9 +212,9 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { switch (midiDriver) { case MD_NULL: return MidiDriver_NULL_create(); - case MD_ADLIB: return MidiDriver_ADLIB_create(g_engine->_mixer); + case MD_ADLIB: return MidiDriver_ADLIB_create(g_system->getMixer()); - case MD_TOWNS: return MidiDriver_YM2612_create(g_engine->_mixer); + case MD_TOWNS: return MidiDriver_YM2612_create(g_system->getMixer()); // Right now PC Speaker and PCjr are handled // outside the MidiDriver architecture, so @@ -222,11 +223,11 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { case MD_PCJR: return NULL; #ifdef USE_FLUIDSYNTH - case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_engine->_mixer); + case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_system->getMixer()); #endif #ifdef USE_MT32EMU - case MD_MT32: return MidiDriver_MT32_create(g_engine->_mixer); + case MD_MT32: return MidiDriver_MT32_create(g_system->getMixer()); #endif #if defined(PALMOS_MODE) |