aboutsummaryrefslogtreecommitdiff
path: root/gameDetector.cpp
diff options
context:
space:
mode:
authorNicolas Noble2002-05-16 06:46:50 +0000
committerNicolas Noble2002-05-16 06:46:50 +0000
commit5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50 (patch)
treecb82f69a3dfa64011f81e85333b5a303261d3c00 /gameDetector.cpp
parent4f24f91f8c47d2f91233cc41057c808aa3f0df9f (diff)
downloadscummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.tar.gz
scummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.tar.bz2
scummvm-rg350-5edf1e6d7f9ca5ce8fa4e6ded69adff61c60ab50.zip
Added an ALSA sequencer support. Updated readme.txt to explain it, and
Makefile to allow the user to enable it. I also reorganised the Makefile a bit, since there is now one more optionnal library. BBrox, I also merged your Makefile.x11 in it, just take a look at it! svn-id: r4341
Diffstat (limited to 'gameDetector.cpp')
-rw-r--r--gameDetector.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp
index 06ed0757f8..f378b511be 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -320,6 +320,7 @@ bool GameDetector::parseMusicDriver(const char *s) {
{"core",MD_COREAUDIO},
{"amidi",MD_AMIDI},
{"midiemu",MD_MIDIEMU},
+ {"alsa", MD_ALSA},
{"adlib",-1},
};
@@ -608,6 +609,9 @@ MidiDriver *GameDetector::createMidi() {
#if defined(__APPLE__)
case MD_COREAUDIO: return MidiDriver_CORE_create();
#endif
+#if defined(UNIX) && defined(USE_ALSA)
+ case MD_ALSA: return MidiDriver_ALSA_create();
+#endif
}
error("Invalid midi driver selected");