[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.11,1.12
James Brown
ender at users.sourceforge.net
Sun Sep 29 04:12:02 CEST 2002
Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv9072/common
Modified Files:
gameDetector.cpp
Log Message:
Merge in 615745: GMD via AdLib emulation
Remove MIDIEMU driver obsoleted by patch.
Change functionality to fallback to AdLib/AdLibGMD Emulation where MIDI init fails
Switch to NewGUI by default (old code retained 'Just in case')
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gameDetector.cpp 27 Sep 2002 23:27:14 -0000 1.11
+++ gameDetector.cpp 29 Sep 2002 11:11:42 -0000 1.12
@@ -587,9 +587,16 @@
MidiDriver *GameDetector::createMidi() {
int drv = _midi_driver;
-#if defined (_WIN32_WCE)
- /* Always use MIDI emulation on CE devices */
- if (drv == MD_AUTO) drv = MD_MIDIEMU;
+#if defined (_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND)
+ /* Always use MIDI emulation via adlib driver on CE and UNIX devices */
+
+ /* FIXME: We should, for the Unix targets, attempt to detect */
+ /* whether a sequencer is available, and use it in */
+ /* preference */
+ if (drv == MD_AUTO) {
+ _use_adlib = true;
+ return NULL;
+ }
#endif
#if defined (WIN32) && !defined(_WIN32_WCE)
@@ -598,17 +605,11 @@
#elif defined(__APPLE__) || defined(macintosh)
/* MD_QTMUSIC is default MidiDriver on MacOS targets */
if (drv == MD_AUTO) drv = MD_QTMUSIC;
-#elif defined(UNIX) || defined(X11_BACKEND)
- /* MD_MIDIEMU is default MidiDriver on UNIX targets. */
- /* FIXME: Attempt to detect if sequencer is available,
- and use it in preference. */
- if (drv == MD_AUTO) drv = MD_MIDIEMU;
#endif
switch(drv) {
case MD_AUTO:
case MD_NULL: return MidiDriver_NULL_create();
- case MD_MIDIEMU: return MidiDriver_MIDIEMU_create();
#if defined(WIN32) && !defined(_WIN32_WCE)
case MD_WINDOWS: return MidiDriver_WIN_create();
#endif
More information about the Scummvm-git-logs
mailing list