[Scummvm-cvs-logs] scummvm master -> b5d1c669158951d4ea1633d3c10c58729d28fda5

lordhoto lordhoto at gmail.com
Wed Feb 16 23:34:34 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b5d1c66915 KYRA: Set type for NULL MIDI driver to PC Speaker.


Commit: b5d1c669158951d4ea1633d3c10c58729d28fda5
    https://github.com/scummvm/scummvm/commit/b5d1c669158951d4ea1633d3c10c58729d28fda5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-16T14:30:03-08:00

Commit Message:
KYRA: Set type for NULL MIDI driver to PC Speaker.

This avoids a dialog about MT-32 to General MIDI conversion shown when running
Kyrandia 1. Formerly the NULL MIDI output type was set to General MIDI, which
caused the aforementioned dialog to show up, because Kyrandia 1 has no General
MIDI tracks.

Changed paths:
    engines/kyra/kyra_v1.cpp



diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index fec37dc..3a5d211 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -129,10 +129,11 @@ Common::Error KyraEngine_v1::init() {
 			_sound = new SoundAdLibPC(this, _mixer);
 		} else {
 			Sound::kType type;
+			const MusicType midiType = MidiDriver::getMusicType(dev);
 
-			if (MidiDriver::getMusicType(dev) == MT_PCSPK)
+			if (midiType == MT_PCSPK || midiType == MT_NULL)
 				type = Sound::kPCSpkr;
-			else if (MidiDriver::getMusicType(dev) == MT_MT32 || ConfMan.getBool("native_mt32"))
+			else if (midiType == MT_MT32 || ConfMan.getBool("native_mt32"))
 				type = Sound::kMidiMT32;
 			else
 				type = Sound::kMidiGM;






More information about the Scummvm-git-logs mailing list