From 2bcafcb02dd406a36fd0a11c6b0df742840a9a7e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 15 Jun 2010 10:55:31 +0000
Subject: Sound: add PCJR as a pseudodriver.

Since AGI distinguishes between PCSPK and PCJR/Tandy, make it as a
pseudodriver.

svn-id: r49782
---
 engines/agi/agi.cpp | 2 +-
 sound/mididrv.cpp   | 2 +-
 sound/mididrv.h     | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 2f87d7b8ef..21b28fd445 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -583,7 +583,7 @@ void AgiEngine::initialize() {
 	} else if (getPlatform() == Common::kPlatformCoCo3) {
 		_soundemu = SOUND_EMU_COCO3;
 	} else {
-		switch (MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI)) {
+		switch (MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_PCJR | MDT_ADLIB | MDT_MIDI)) {
 		case MD_PCSPK:
 			_soundemu = SOUND_EMU_PC;
 			break;
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index e34f5a9705..f7198056b4 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -87,7 +87,7 @@ static const MidiDriverDescription s_musicDrivers[] = {
 	// The flags for the "adlib" driver indicates that it can do AdLib and MIDI.
 	{"adlib", _s("AdLib"), MD_ADLIB, MDT_ADLIB},
 	{"pcspk", _s("PC Speaker"), MD_PCSPK, MDT_PCSPK},
-	{"pcjr", _s("IBM PCjr"), MD_PCJR, MDT_PCSPK},
+	{"pcjr", _s("IBM PCjr"), MD_PCJR, MDT_PCSPK | MDT_PCJR},
 	{"cms", _s("Creative Music System"), MD_CMS, MDT_CMS},
 	{"towns", _s("FM Towns"), MD_TOWNS, MDT_TOWNS},
 #if defined(UNIX)
diff --git a/sound/mididrv.h b/sound/mididrv.h
index d7e89dd9ca..69cbb7ab65 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -100,10 +100,11 @@ enum MidiDriverFlags {
 	MDT_NONE   = 0,
 	MDT_PCSPK  = 1 << 0,      // PC Speaker: Maps to MD_PCSPK and MD_PCJR
 	MDT_CMS    = 1 << 1,      // Creative Music System / Gameblaster: Maps to MD_CMS
-	MDT_ADLIB  = 1 << 2,      // AdLib: Maps to MD_ADLIB
-	MDT_TOWNS  = 1 << 3,      // FM-TOWNS: Maps to MD_TOWNS
-	MDT_MIDI   = 1 << 4,      // Real MIDI
-	MDT_PREFER_MIDI = 1 << 5  // Real MIDI output is preferred
+	MDT_PCJR   = 1 << 2,      // Tandy/PC Junior driver
+	MDT_ADLIB  = 1 << 3,      // AdLib: Maps to MD_ADLIB
+	MDT_TOWNS  = 1 << 4,      // FM-TOWNS: Maps to MD_TOWNS
+	MDT_MIDI   = 1 << 5,      // Real MIDI
+	MDT_PREFER_MIDI = 1 << 6  // Real MIDI output is preferred
 };
 
 /**
-- 
cgit v1.2.3