[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.85,1.86

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv20190/common

Modified Files:
	gameDetector.cpp 
Log Message:
cleanup

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- gameDetector.cpp	25 Mar 2003 00:26:52 -0000	1.85
+++ gameDetector.cpp	26 Mar 2003 12:30:41 -0000	1.86
@@ -618,29 +618,23 @@
 	int drv = _midi_driver;
 
 
+	if (drv == MD_AUTO) {
 #if defined (WIN32) && !defined(_WIN32_WCE)
-	/* MD_WINDOWS is default MidiDriver on windows targets */
-	if (drv == MD_AUTO) drv = MD_WINDOWS;
+	drv = MD_WINDOWS;	// MD_WINDOWS is default MidiDriver on windows targets
 #elif defined(MACOSX)
-	if (drv == MD_AUTO) drv = MD_COREAUDIO;
+	drv = MD_COREAUDIO;
 #elif defined(macintosh)
-	if (drv == MD_AUTO) drv = MD_QTMUSIC;
+	drv = MD_QTMUSIC;
 #elif defined(__MORPHOS__)
-	if (drv == MD_AUTO) drv = MD_ETUDE;
+	drv = MD_ETUDE;
 #elif defined (_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND)
-	/* Always use MIDI emulation via adlib driver on CE and UNIX devices */
+	// Always use MIDI emulation via adlib driver on CE and UNIX device
 
-	/* 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;
-	}
-*/
-	if (drv == MD_AUTO) drv = MD_ADLIB;
+	// TODO: We should, for the Unix targets, attempt to detect
+	// whether a sequencer is available, and use it instead.
+	drv = MD_ADLIB;
 #endif
+	}
 
 	switch(drv) {
 	case MD_AUTO: