aboutsummaryrefslogtreecommitdiff
path: root/gameDetector.cpp
diff options
context:
space:
mode:
authorMax Horn2002-04-26 13:18:49 +0000
committerMax Horn2002-04-26 13:18:49 +0000
commitd83fcb54d0b8120dc584113461416a2878c1f9a3 (patch)
tree0417f9f8fe2646c9699dda5fbae58f8f412e97c6 /gameDetector.cpp
parentd5d06612ed9d3c7e3966f673a791ad30984cf1c6 (diff)
downloadscummvm-rg350-d83fcb54d0b8120dc584113461416a2878c1f9a3.tar.gz
scummvm-rg350-d83fcb54d0b8120dc584113461416a2878c1f9a3.tar.bz2
scummvm-rg350-d83fcb54d0b8120dc584113461416a2878c1f9a3.zip
added new style midi drivers using QuickTime (MacOS 9 & X) and CoreAudio (MacOS X)
svn-id: r4086
Diffstat (limited to 'gameDetector.cpp')
-rw-r--r--gameDetector.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp
index 1b6f4eeb10..e1c885ef27 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -205,6 +205,7 @@ bool GameDetector::parseMusicDriver(const char *s) {
{"timidity",MD_TIMIDITY},
{"seq",MD_SEQ},
{"qt",MD_QTMUSIC},
+ {"core",MD_COREAUDIO},
{"amidi",MD_AMIDI},
{"adlib",-1},
};
@@ -446,6 +447,9 @@ MidiDriver *GameDetector::createMidi() {
#if defined (WIN32) && !defined(_WIN32_WCE)
/* MD_WINDOWS is default MidiDriver on windows targets */
if (drv == MD_AUTO) drv = MD_WINDOWS;
+#elif defined(__APPLE__)
+ /* MD_QTMUSIC is default MidiDriver on MacOS targets */
+ if (drv == MD_AUTO) drv = MD_QTMUSIC;
#endif
switch(drv) {
@@ -460,6 +464,10 @@ MidiDriver *GameDetector::createMidi() {
#if defined(UNIX) && !defined(__BEOS__)
case MD_SEQ: return MidiDriver_SEQ_create();
#endif
+#if defined(__APPLE__)
+ case MD_QTMUSIC: return MidiDriver_QT_create();
+ case MD_COREAUDIO: return MidiDriver_CORE_create();
+#endif
}
error("Invalid midi driver selected");