[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.61,1.62 scummvm.cpp,1.142,1.143

[Lionel Ulmer]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12689

Modified Files:
	gameDetector.cpp scummvm.cpp 
Log Message:
First commit of the OPL2 MIDI driver (to have MIDI music without
requiring any OS-level MIDI support).

This was taken from AdPlug.

This is *very* buggy for now (well, it works, but it sounds just plain
ugly :-) ).



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- gameDetector.cpp	7 May 2002 08:53:27 -0000	1.61
+++ gameDetector.cpp	7 May 2002 22:07:28 -0000	1.62
@@ -317,6 +317,7 @@
 		{"qt",MD_QTMUSIC},
 		{"core",MD_COREAUDIO},
 		{"amidi",MD_AMIDI},
+		{"midiemu",MD_MIDIEMU},
 		{"adlib",-1},
 	};
 
@@ -579,6 +580,7 @@
 	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
@@ -586,13 +588,13 @@
 	case MD_AMIDI:		return MidiDriver_AMIDI_create();
 #endif
 #if defined(UNIX) && !defined(__BEOS__)
-    case MD_SEQ:        return MidiDriver_SEQ_create();
+	case MD_SEQ:		return MidiDriver_SEQ_create();
 #endif
 #if defined(__APPLE__) || defined(macintosh)
-	case MD_QTMUSIC:		return MidiDriver_QT_create();
+	case MD_QTMUSIC:	return MidiDriver_QT_create();
 #endif
 #if defined(__APPLE__)
-	case MD_COREAUDIO:		return MidiDriver_CORE_create();
+	case MD_COREAUDIO:	return MidiDriver_CORE_create();
 #endif
 	}
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- scummvm.cpp	7 May 2002 18:44:34 -0000	1.142
+++ scummvm.cpp	7 May 2002 22:07:28 -0000	1.143
@@ -1398,6 +1398,9 @@
          } 
 	scumm->_mixer->set_volume(128);
 
+	/* HACK !!! */
+	g_scumm = scumm;
+	/* END HACK */
 
 	scumm->_fullScreen = detector->_fullScreen;
 	scumm->_debugMode = detector->_debugMode;