From f994deb4eeda51eb3a73e555b69f44e8ee1a6c6a Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 21 Sep 2010 06:05:27 +0000
Subject: AGI: Deconfusify the AGI music driver

(After a brief discussion with sev.) AdLib is now the old Sarien sound,
PCjr is the new PCjr emulation. PCjr is still the default; we don't
need to ask getMusicType() how to get there.

svn-id: r52838
---
 engines/agi/agi.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 508f473609..0646f321d4 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -577,18 +577,19 @@ void AgiEngine::initialize() {
 		_soundemu = SOUND_EMU_APPLE2GS;
 	} else if (getPlatform() == Common::kPlatformCoCo3) {
 		_soundemu = SOUND_EMU_COCO3;
+	} else if (ConfMan.get("music_driver") == "auto") {
+		// Default sound is the proper PCJr emulation
+		_soundemu = SOUND_EMU_PCJR;
 	} else {
 		switch (MidiDriver::getMusicType(MidiDriver::detectDevice(MDT_PCSPK|MDT_AMIGA|MDT_ADLIB|MDT_PCJR|MDT_MIDI))) {
 		case MT_PCSPK:
 			_soundemu = SOUND_EMU_PC;
 			break;
 		case MT_ADLIB:
-			// Default sound is the proper PCJr emulation
-			_soundemu = SOUND_EMU_PCJR;
+			_soundemu = SOUND_EMU_NONE;
 			break;
 		case MT_PCJR:
-			// Under PCJr Sarien emu is disguised
-			_soundemu = SOUND_EMU_NONE;
+			_soundemu = SOUND_EMU_PCJR;
 			break;
 		case MT_AMIGA:
 			_soundemu = SOUND_EMU_AMIGA;
-- 
cgit v1.2.3