aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2010-06-21 21:36:36 +0000
committerMax Horn2010-06-21 21:36:36 +0000
commitbbad3f333a9227ccb1de633a0fe92d9e01ad7bb3 (patch)
treee5b53717ffc5972cec14be581f586228c245b858 /common
parent49448af6cb2613460fe37caf79bdb1ed4c206715 (diff)
downloadscummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.tar.gz
scummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.tar.bz2
scummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.zip
Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
Diffstat (limited to 'common')
-rw-r--r--common/util.cpp3
-rw-r--r--common/util.h5
2 files changed, 5 insertions, 3 deletions
diff --git a/common/util.cpp b/common/util.cpp
index b8bd327a0a..70499a984f 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -305,7 +305,8 @@ const struct GameOpt {
{ GUIO_MIDIPCJR, "midiPCJr" },
{ GUIO_MIDIADLIB, "midiAdLib" },
{ GUIO_MIDITOWNS, "midiTowns" },
- { GUIO_MIDI, "midiMidi" },
+ { GUIO_MIDIMT32, "midiMt32" },
+ { GUIO_MIDIGM, "midiGM" },
{ GUIO_NONE, 0 }
};
diff --git a/common/util.h b/common/util.h
index 71456353c7..d7d68cc1ca 100644
--- a/common/util.h
+++ b/common/util.h
@@ -223,8 +223,9 @@ enum GameGUIOption {
GUIO_MIDICMS = (1 << 7),
GUIO_MIDIPCJR = (1 << 8),
GUIO_MIDIADLIB = (1 << 9),
- GUIO_MIDITOWNS = (1 << 10),
- GUIO_MIDI = (1 << 11)
+ GUIO_MIDITOWNS = (1 << 10),
+ GUIO_MIDIMT32 = (1 << 11),
+ GUIO_MIDIGM = (1 << 12)
};
bool checkGameGUIOption(GameGUIOption option, const String &str);