diff options
| author | Max Horn | 2003-03-26 12:30:41 +0000 |
|---|---|---|
| committer | Max Horn | 2003-03-26 12:30:41 +0000 |
| commit | c5cc9d8f60f7702335305120de8e0c65a652112b (patch) | |
| tree | 78955c55bc39e1dbba525b471109a78e3034bbd8 | |
| parent | 3b1d4e4c06f00e7136a59beac6ea58b0715e0512 (diff) | |
| download | scummvm-rg350-c5cc9d8f60f7702335305120de8e0c65a652112b.tar.gz scummvm-rg350-c5cc9d8f60f7702335305120de8e0c65a652112b.tar.bz2 scummvm-rg350-c5cc9d8f60f7702335305120de8e0c65a652112b.zip | |
cleanup
svn-id: r6865
| -rw-r--r-- | common/gameDetector.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index e878fea9e7..71399b8751 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -618,29 +618,23 @@ MidiDriver *GameDetector::createMidi() { int drv = _midi_driver; + if (drv == MD_AUTO) { #if defined (WIN32) && !defined(_WIN32_WCE) - /* MD_WINDOWS is default MidiDriver on windows targets */ - if (drv == MD_AUTO) drv = MD_WINDOWS; + drv = MD_WINDOWS; // MD_WINDOWS is default MidiDriver on windows targets #elif defined(MACOSX) - if (drv == MD_AUTO) drv = MD_COREAUDIO; + drv = MD_COREAUDIO; #elif defined(macintosh) - if (drv == MD_AUTO) drv = MD_QTMUSIC; + drv = MD_QTMUSIC; #elif defined(__MORPHOS__) - if (drv == MD_AUTO) drv = MD_ETUDE; + drv = MD_ETUDE; #elif defined (_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) - /* Always use MIDI emulation via adlib driver on CE and UNIX devices */ + // Always use MIDI emulation via adlib driver on CE and UNIX device - /* FIXME: We should, for the Unix targets, attempt to detect */ - /* whether a sequencer is available, and use it in */ - /* preference */ -/* - if (drv == MD_AUTO) { - _use_adlib = true; - return NULL; - } -*/ - if (drv == MD_AUTO) drv = MD_ADLIB; + // TODO: We should, for the Unix targets, attempt to detect + // whether a sequencer is available, and use it instead. + drv = MD_ADLIB; #endif + } switch(drv) { case MD_AUTO: |