[Scummvm-cvs-logs] SF.net SVN: scummvm: [23651] scummvm/trunk/engines/kyra/kyra.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 23651
Author:   eriktorbjorn
Date:     2006-08-01 00:44:38 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23651&view=rev

Log Message:
-----------
Until the native Kyra 2 Adlib music is supported, enable the automagic MIDI-to-
Adlib converter.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2006-08-01 03:29:32 UTC (rev 23650)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2006-08-01 07:44:38 UTC (rev 23651)
@@ -141,7 +141,10 @@
 	// for now we prefer Adlib over native MIDI
 	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
 
-	if (midiDriver == MD_ADLIB) {
+	// TODO: We should play the native Kyra 2 Adlib music, but until that
+	//       is support, we'll use the automagic MIDI -> Adlib converter.
+
+	if (midiDriver == MD_ADLIB && _game == GI_KYRA1) {
 		_sound = new SoundAdlibPC(_mixer, this);
 		assert(_sound);
 	} else {
@@ -162,7 +165,7 @@
 		// missing. It's just that at least at the time of writing they
 		// decidedly inferior to the Adlib ones.
 
-		if (ConfMan.getBool("multi_midi")) {
+		if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) {
 			SoundAdlibPC *adlib = new SoundAdlibPC(_mixer, this);
 			assert(adlib);
 			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.