diff options
| author | Max Horn | 2003-10-18 00:22:46 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-18 00:22:46 +0000 |
| commit | 33f2fbff08573634e868c50d5cff3e4d2482a543 (patch) | |
| tree | 8f2d54cc54085bd418743b5b2d4fbcbcb7882a63 /scumm | |
| parent | 0694eed27393ee7d1cbeccd20e8641fa261f5642 (diff) | |
| download | scummvm-rg350-33f2fbff08573634e868c50d5cff3e4d2482a543.tar.gz scummvm-rg350-33f2fbff08573634e868c50d5cff3e4d2482a543.tar.bz2 scummvm-rg350-33f2fbff08573634e868c50d5cff3e4d2482a543.zip | |
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now
svn-id: r10883
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 86de4be748..38e398bc26 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -604,7 +604,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) // differing from the regular version(s) of that game. _gameName = ConfMan.hasKey("basename") ? ConfMan.get("basename") : detector->_game.gameName; - _midiDriver = detector->_midi_driver; + _midiDriver = GameDetector::detectMusicDriver(detector->_game.midi); _demoMode = ConfMan.getBool("demo_mode"); _noSubtitles = ConfMan.getBool("nosubtitles"); @@ -654,11 +654,11 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) _silentDigitalImuse = false; if (!_mixer->bindToSystem(syst)) { warning("Sound mixer initialization failed"); - if (detector->_midi_driver == MD_ADLIB || - detector->_midi_driver == MD_PCSPK || - detector->_midi_driver == MD_PCJR) + if (_midiDriver == MD_ADLIB || + _midiDriver == MD_PCSPK || + _midiDriver == MD_PCJR) { - _midiDriver = detector->_midi_driver = MD_NULL; + _midiDriver = MD_NULL; warning("MIDI driver depends on sound mixer, switching to null MIDI driver"); } _silentDigitalImuse = true; @@ -679,7 +679,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) } else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) { _musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK); } else if (_version > 2) { - MidiDriver *driver = detector->createMidi(); + MidiDriver *driver = detector->createMidi(_midiDriver); if (driver && _native_mt32) driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE); _musicEngine = _imuse = IMuse::create(syst, _mixer, driver); |