diff options
author | Eugene Sandulenko | 2010-06-15 10:56:12 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-06-15 10:56:12 +0000 |
commit | 67bc7115804b6f256f776fc761f7fffffa901c31 (patch) | |
tree | 56ca91c3a8a3ab0fb3d7154f9fb43fecae0aba90 /common | |
parent | 2bcafcb02dd406a36fd0a11c6b0df742840a9a7e (diff) | |
download | scummvm-rg350-67bc7115804b6f256f776fc761f7fffffa901c31.tar.gz scummvm-rg350-67bc7115804b6f256f776fc761f7fffffa901c31.tar.bz2 scummvm-rg350-67bc7115804b6f256f776fc761f7fffffa901c31.zip |
GUI: Implement MIDI drivers as GUI options.
Proper version of patch #2988641: "GSoC: Select drivers in GUI
based on output types". So far only SCUMM engine supports this
feature.
svn-id: r49783
Diffstat (limited to 'common')
-rw-r--r-- | common/util.cpp | 18 | ||||
-rw-r--r-- | common/util.h | 13 |
2 files changed, 23 insertions, 8 deletions
diff --git a/common/util.cpp b/common/util.cpp index 742eb0035d..895bcebef7 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -293,12 +293,20 @@ const struct GameOpt { uint32 option; const char *desc; } g_gameOptions[] = { - { GUIO_NOSUBTITLES, "sndNoSubs" }, - { GUIO_NOMUSIC, "sndNoMusic" }, - { GUIO_NOSPEECH, "sndNoSpeech" }, - { GUIO_NOSFX, "sndNoSFX" }, - { GUIO_NOMIDI, "sndNoMIDI" }, + { GUIO_NOSUBTITLES, "sndNoSubs" }, + { GUIO_NOMUSIC, "sndNoMusic" }, + { GUIO_NOSPEECH, "sndNoSpeech" }, + { GUIO_NOSFX, "sndNoSFX" }, + { GUIO_NOMIDI, "sndNoMIDI" }, { GUIO_NOLAUNCHLOAD, "launchNoLoad" }, + + { GUIO_MIDIPCSPK, "midiPCSpk" }, + { GUIO_MIDICMS, "midiCMS" }, + { GUIO_MIDIPCJR, "midiPCJr" }, + { GUIO_MIDIADLIB, "midiAdLib" }, + { GUIO_MIDITOWNS, "midiTowns" }, + { GUIO_MIDI, "midiMidi" }, + { GUIO_NONE, 0 } }; diff --git a/common/util.h b/common/util.h index 0b7a44f5b3..62c8f0d1fb 100644 --- a/common/util.h +++ b/common/util.h @@ -215,9 +215,16 @@ enum GameGUIOption { GUIO_NOSUBTITLES = (1 << 0), GUIO_NOMUSIC = (1 << 1), GUIO_NOSPEECH = (1 << 2), - GUIO_NOSFX = (1 << 3), - GUIO_NOMIDI = (1 << 4), - GUIO_NOLAUNCHLOAD = (1 << 5) + GUIO_NOSFX = (1 << 3), + GUIO_NOMIDI = (1 << 4), + GUIO_NOLAUNCHLOAD = (1 << 5), + + GUIO_MIDIPCSPK = (1 << 6), + GUIO_MIDICMS = (1 << 7), + GUIO_MIDIPCJR = (1 << 8), + GUIO_MIDIADLIB = (1 << 9), + GUIO_MIDITOWNS = (1 << 10), + GUIO_MIDI = (1 << 11) }; bool checkGameGUIOption(GameGUIOption option, const String &str); |