From 723ad1bdc13b959b423c0867e4f3441f8e0bc855 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 8 Jan 2010 14:26:26 +0000
Subject: SCI: changed handling when unsupported sound type is selected, we are
 switching to adlib or amiga sound then

svn-id: r47156
---
 engines/sci/sound/music.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index b8ecc0ac38..eb960a0dbc 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -70,6 +70,16 @@ void SciMusic::init() {
 	if (_midiType == MD_AUTO)
 		_midiType = MD_ADLIB;
 
+	switch (_midiType) {
+	case MD_ADLIB:
+	case MD_PCJR:
+	case MD_PCSPK:
+		break;
+	default:
+		warning("Unhandled MIDI type, switching to default");
+		_midiType = MD_ADLIB;
+	}
+
 	switch (_midiType) {
 	case MD_ADLIB:
 		// FIXME: There's no Amiga sound option, so we hook it up to Adlib
@@ -84,13 +94,8 @@ void SciMusic::init() {
 	case MD_PCSPK:
 		_pMidiDrv = new MidiPlayer_PCSpeaker();
 		break;
-	case MD_MT32:
-		// TODO
-	default:
-		warning("Unhandled MIDI type, switching to Adlib");
-		_midiType = MD_ADLIB;
-		_pMidiDrv = MidiPlayer_Adlib_create();
-		break;
+	//case MD_MT32:
+	// TODO
 	}
 
 	if (_pMidiDrv) {
-- 
cgit v1.2.3