diff options
| author | Florian Kagerer | 2010-08-11 18:54:56 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-08-11 18:54:56 +0000 |
| commit | 4a159bcb1e086d03c7bd1216694552ed5a83103e (patch) | |
| tree | df4c767bf3911bbb7ffa6dabbdea7a3a2220235e /gui/options.cpp | |
| parent | 0c7932cc7cd54ea8fdee9d12663657d67eaa7639 (diff) | |
| download | scummvm-rg350-4a159bcb1e086d03c7bd1216694552ed5a83103e.tar.gz scummvm-rg350-4a159bcb1e086d03c7bd1216694552ed5a83103e.tar.bz2 scummvm-rg350-4a159bcb1e086d03c7bd1216694552ed5a83103e.zip | |
GUI: add music devices for c64, amiga and apple II gs
These devices are not able to create appropriate drivers.
The only purpose for now is having proper gui options and flags and music types for the device detector.
The corresponding GUIO flags for the new devices have been added, too.
svn-id: r51995
Diffstat (limited to 'gui/options.cpp')
| -rw-r--r-- | gui/options.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index d1901e9219..69e92bf5eb 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -672,7 +672,8 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { const uint32 deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType()); - if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS) // global dialog - skip useless FM-Towns option there + if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS // global dialog - skip useless FM-Towns, C64, Amiga, AppleIIGS options there + && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS) || (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified || (_guioptions & deviceGuiOption) // flag is present // HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set, |