[Scummvm-cvs-logs] SF.net SVN: scummvm:[49782] scummvm/trunk

[sev at users.sourceforge.net]

Revision: 49782
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49782&view=rev
Author:   sev
Date:     2010-06-15 10:55:31 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Sound: add PCJR as a pseudodriver.

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

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/sound/mididrv.cpp
    scummvm/trunk/sound/mididrv.h

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2010-06-15 10:55:07 UTC (rev 49781)
+++ scummvm/trunk/engines/agi/agi.cpp	2010-06-15 10:55:31 UTC (rev 49782)
@@ -583,7 +583,7 @@
 	} 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;

Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp	2010-06-15 10:55:07 UTC (rev 49781)
+++ scummvm/trunk/sound/mididrv.cpp	2010-06-15 10:55:31 UTC (rev 49782)
@@ -87,7 +87,7 @@
 	// 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)

Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h	2010-06-15 10:55:07 UTC (rev 49781)
+++ scummvm/trunk/sound/mididrv.h	2010-06-15 10:55:31 UTC (rev 49782)
@@ -100,10 +100,11 @@
 	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
 };
 
 /**


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