[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.12,1.13 gameDetector.h,1.6,1.7

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv26104/base

Modified Files:
	gameDetector.cpp gameDetector.h 
Log Message:
Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation
needs to be checked for portability.

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gameDetector.cpp	5 Oct 2003 14:03:07 -0000	1.12
+++ gameDetector.cpp	5 Oct 2003 15:34:53 -0000	1.13
@@ -676,12 +676,15 @@
 		if (_game.midi & MDT_PREFER_NATIVE)
 			_midi_driver = getMidiDriverType();
 		else
-			_midi_driver = MD_ADLIB;
+			_midi_driver = MD_TOWNS;
 	}
 	bool nativeMidiDriver =
 		(_midi_driver != MD_NULL && _midi_driver != MD_ADLIB &&
-		 _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR);
+		 _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR &&
+		 _midi_driver != MD_TOWNS);
 	if (nativeMidiDriver && !(_game.midi & MDT_NATIVE))
+		_midi_driver = MD_TOWNS;
+	if (_midi_driver == MD_TOWNS && !(_game.midi & MDT_TOWNS))
 		_midi_driver = MD_ADLIB;
 	if (_midi_driver == MD_ADLIB && !(_game.midi & MDT_ADLIB))
 		_midi_driver = MD_PCJR;
@@ -770,11 +773,14 @@
 
 	switch(drv) {
 	case MD_NULL:      return MidiDriver_NULL_create();
+
 	// In the case of Adlib, we won't specify anything.
 	// IMuse is designed to set up its own Adlib driver
 	// if need be, and we only have to specify a native
 	// driver.
 	case MD_ADLIB:     return NULL;
+
+	case MD_TOWNS:     return MidiDriver_YM2612_create(g_engine->_mixer);
 
 	// Right now PC Speaker and PCjr are handled
 	// outside the MidiDriver architecture, so

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gameDetector.h	2 Oct 2003 22:52:57 -0000	1.6
+++ gameDetector.h	5 Oct 2003 15:34:53 -0000	1.7
@@ -70,8 +70,9 @@
 	MDT_NONE   = 0,
 	MDT_PCSPK  = 1, // MD_PCSPK and MD_PCJR
 	MDT_ADLIB  = 2, // MD_ADLIB
-	MDT_NATIVE = 4,  // Everything else
-	MDT_PREFER_NATIVE = 8
+	MDT_TOWNS  = 4, // MD_TOWNS
+	MDT_NATIVE = 8, // Everything else
+	MDT_PREFER_NATIVE = 16
 };
 
 struct TargetSettings {