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

[lordhoto at users.sourceforge.net]

Revision: 29997
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29997&view=rev
Author:   lordhoto
Date:     2007-12-25 17:09:46 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
Simplification of GM vs MT-32 detection.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/kyra/sound.h

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2007-12-26 00:22:32 UTC (rev 29996)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2007-12-26 01:09:46 UTC (rev 29997)
@@ -116,9 +116,6 @@
 		assert(_sound);
 		soundMidiPc->hasNativeMT32(native_mt32);
 
-		// C55 appears to be XMIDI for General MIDI instruments
-		soundMidiPc->setUseC55(_flags.gameID == GI_KYRA2 && !native_mt32);
-
 		// Unlike some SCUMM games, it's not that the MIDI sounds are
 		// missing. It's just that at least at the time of writing they
 		// are decidedly inferior to the Adlib ones.

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2007-12-26 00:22:32 UTC (rev 29996)
+++ scummvm/trunk/engines/kyra/sound.cpp	2007-12-26 01:09:46 UTC (rev 29997)
@@ -131,6 +131,16 @@
 	close();
 }
 
+void SoundMidiPC::hasNativeMT32(bool nativeMT32) {
+	_nativeMT32 = nativeMT32;
+
+	// C55 appears to be XMIDI for General MIDI instruments
+	if (!_nativeMT32 && _vm->game() == GI_KYRA2)
+		_useC55 = true;
+	else
+		_useC55 = false;
+}
+
 void SoundMidiPC::setVolume(int volume) {
 	if (volume < 0)
 		volume = 0;

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2007-12-26 00:22:32 UTC (rev 29996)
+++ scummvm/trunk/engines/kyra/sound.h	2007-12-26 01:09:46 UTC (rev 29997)
@@ -322,9 +322,8 @@
 	MidiChannel *getPercussionChannel()	{ return 0; }
 
 	void setPassThrough(bool b)	{ _passThrough = b; }
-	void setUseC55(bool b)		{ _useC55 = b; }
 
-	void hasNativeMT32(bool nativeMT32) { _nativeMT32 = nativeMT32; }
+	void hasNativeMT32(bool nativeMT32);
 	bool isMT32() { return _nativeMT32; }
 
 private:


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