aboutsummaryrefslogtreecommitdiff
path: root/common/gameDetector.cpp
diff options
context:
space:
mode:
authorRuediger Hanke2002-10-02 23:31:40 +0000
committerRuediger Hanke2002-10-02 23:31:40 +0000
commit2fd0a3d458caede859c80a6245522218891caac3 (patch)
tree576bd608e6652bd3ec11eeda12a20438fa5abc99 /common/gameDetector.cpp
parent87ae5b24c7ed1d44865a115e88dc1ddcbbcba218 (diff)
downloadscummvm-rg350-2fd0a3d458caede859c80a6245522218891caac3.tar.gz
scummvm-rg350-2fd0a3d458caede859c80a6245522218891caac3.tar.bz2
scummvm-rg350-2fd0a3d458caede859c80a6245522218891caac3.zip
Renamed new AMidi to Etude
svn-id: r5079
Diffstat (limited to 'common/gameDetector.cpp')
-rw-r--r--common/gameDetector.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 7a2fcdb3d8..d63605d105 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -362,7 +362,7 @@ bool GameDetector::parseMusicDriver(const char *s) {
{"seq",MD_SEQ},
{"qt",MD_QTMUSIC},
{"core",MD_COREAUDIO},
- {"amidi",MD_AMIDI},
+ {"etude",MD_ETUDE},
{"midiemu",MD_MIDIEMU},
{"alsa", MD_ALSA},
{"adlib",-1},
@@ -600,6 +600,8 @@ MidiDriver *GameDetector::createMidi() {
#elif defined(__APPLE__) || defined(macintosh)
/* MD_QTMUSIC is default MidiDriver on MacOS targets */
if (drv == MD_AUTO) drv = MD_QTMUSIC;
+#elif defined(__MORPHOS__)
+ if (drv == MD_AUTO) drv = MD_ETUDE;
#endif
switch(drv) {
@@ -609,7 +611,7 @@ MidiDriver *GameDetector::createMidi() {
case MD_WINDOWS: return MidiDriver_WIN_create();
#endif
#if defined(__MORPHOS__)
- case MD_AMIDI: return MidiDriver_AMIDI_create();
+ case MD_ETUDE: return MidiDriver_ETUDE_create();
#endif
#if defined(UNIX) && !defined(__BEOS__)
case MD_SEQ: return MidiDriver_SEQ_create();