diff options
Diffstat (limited to 'engines/m4/m4.cpp')
| -rw-r--r-- | engines/m4/m4.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp index d8d25f6895..4cc2bf8783 100644 --- a/engines/m4/m4.cpp +++ b/engines/m4/m4.cpp @@ -151,7 +151,6 @@ MadsM4Engine::~MadsM4Engine() { delete _palette; delete _globals; delete _sound; - delete _driver; delete _resourceManager; } @@ -159,16 +158,8 @@ Common::Error MadsM4Engine::run() { // Initialize backend _screen = new M4Surface(true); // Special form for creating screen reference - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); - bool native_mt32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); - - _driver = MidiDriver::createMidi(dev); - if (native_mt32) - _driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); - - _midi = new MidiPlayer(this, _driver); - _midi->setGM(true); - _midi->setNativeMT32(native_mt32); + _midi = new MidiPlayer(this); + _midi->setGM(true); // FIXME: Really? Always? _saveLoad = new SaveLoad(this); _palette = new Palette(this); |