diff options
| author | Chris Apers | 2003-06-17 08:50:15 +0000 |
|---|---|---|
| committer | Chris Apers | 2003-06-17 08:50:15 +0000 |
| commit | d120ea093f27c58f5bd6b66aff32aa0eac1bb236 (patch) | |
| tree | 7c72c632e2b2b4986b520693a6e4a8212648ed4c /common | |
| parent | d2bb0149d3462c184e0759091d7190865c315758 (diff) | |
| download | scummvm-rg350-d120ea093f27c58f5bd6b66aff32aa0eac1bb236.tar.gz scummvm-rg350-d120ea093f27c58f5bd6b66aff32aa0eac1bb236.tar.bz2 scummvm-rg350-d120ea093f27c58f5bd6b66aff32aa0eac1bb236.zip | |
I will add a wrapper for that (currently NULL driver)
svn-id: r8526
Diffstat (limited to 'common')
| -rw-r--r-- | common/gameDetector.cpp | 7 |
1 files changed, 2 insertions, 5 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) |