[Scummvm-cvs-logs] SF.net SVN: scummvm:[52839] scummvm/branches/branch-1-2-0/engines/agi/agi. cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 52839
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52839&view=rev
Author:   eriktorbjorn
Date:     2010-09-21 06:06:37 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/agi/agi.cpp

Modified: scummvm/branches/branch-1-2-0/engines/agi/agi.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/agi.cpp	2010-09-21 06:05:27 UTC (rev 52838)
+++ scummvm/branches/branch-1-2-0/engines/agi/agi.cpp	2010-09-21 06:06:37 UTC (rev 52839)
@@ -577,18 +577,19 @@
 		_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;


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