diff options
| -rw-r--r-- | common/gameDetector.cpp | 7 | ||||
| -rw-r--r-- | scumm/imuse.cpp | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 594e66f3b1..2b38ee75eb 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -528,7 +528,7 @@ bool GameDetector::isMusicDriverAvailable(int drv) { switch(drv) { case MD_AUTO: case MD_NULL: return true; -#ifndef __PALM_OS__ // not avalaible on palmos : Clie use only ADPCM data and cannot be converted on the fly, may be possible on TT ? +#ifndef __PALM_OS__ // don't show it on palmos case MD_ADLIB: return true; #else case MD_YPA1: return true; @@ -627,13 +627,11 @@ int GameDetector::detectMain() { * and the game is one of those that want adlib as * default, OR if the game is an older game that doesn't * support anything else anyway. */ -#ifndef __PALM_OS__ // currently adlib is not supported on PalmOS if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) || ((_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO)) { _midi_driver = MD_ADLIB; _use_adlib = true; } -#endif if (!_gameDataPath) { warning("No path was provided. Assuming the data files are in the current directory"); @@ -708,13 +706,12 @@ MidiDriver *GameDetector::createMidi() { switch(drv) { case MD_NULL: return MidiDriver_NULL_create(); -#ifndef __PALM_OS__ // In the case of Adlib, we won't specify anything. // IMuse is designed to set up its own Adlib driver // if need be, and we only have to specify a native // driver. case MD_ADLIB: _use_adlib = true; return NULL; -#else +#if defined(__PALM_OS__) case MD_YPA1: return MidiDriver_YamahaPa1_create(); #endif #if defined(WIN32) && !defined(_WIN32_WCE) diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 5291789598..7a0d244273 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -74,7 +74,6 @@ MidiDriver *IMuseInternal::getMidiDriver() { if (_midi_native) { driver = _midi_native; -#if !defined(__PALM_OS__) // Adlib not supported on PalmOS } else { // Route it through Adlib anyway. if (!_midi_adlib) { @@ -82,7 +81,6 @@ MidiDriver *IMuseInternal::getMidiDriver() { initMidiDriver (_midi_adlib); } driver = _midi_adlib; -#endif } return driver; @@ -184,7 +182,6 @@ MidiDriver *IMuseInternal::getBestMidiDriver (int sound) { if (isGM (sound)) { if (_midi_native) { driver = _midi_native; -#if !defined(__PALM_OS__) // Adlib not supported on PalmOS } else { // Route it through Adlib anyway. if (!_midi_adlib) { @@ -192,16 +189,13 @@ MidiDriver *IMuseInternal::getBestMidiDriver (int sound) { initMidiDriver (_midi_adlib); } driver = _midi_adlib; -#endif } -#if !defined(__PALM_OS__) // Adlib not supported on PalmOS } else { if (!_midi_adlib && (_enable_multi_midi || !_midi_native)) { _midi_adlib = MidiDriver_ADLIB_create(); initMidiDriver (_midi_adlib); } driver = _midi_adlib; -#endif } return driver; } |