[Scummvm-cvs-logs] SF.net SVN: scummvm: [31371] scummvm/trunk/engines/agi

[buddha_ at users.sourceforge.net]

Revision: 31371
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31371&view=rev
Author:   buddha_
Date:     2008-04-03 15:15:59 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Add Apple IIGS MIDI program number to instrument number mappings (Both for the older instrument set used by SQ1 only and for the newer instrument set used by all the other tested Apple IIGS games).

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

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2008-04-03 21:42:04 UTC (rev 31370)
+++ scummvm/trunk/engines/agi/sound.cpp	2008-04-03 22:15:59 UTC (rev 31371)
@@ -231,12 +231,22 @@
 
 /** Older Apple IIGS AGI instrument set. Used only by Space Quest I (AGI v1.002). */
 static const instrumentSetInfo instSetV1 = {
-	1192, 26, "7ee16bbc135171ffd6b9120cc7ff1af2", "edd3bf8905d9c238e02832b732fb2e18"
+	1192, 26, "7ee16bbc135171ffd6b9120cc7ff1af2", "edd3bf8905d9c238e02832b732fb2e18",
+	{19, 20, 22, 23, 21, 24, 5, 5, 5, 5,
+	6, 7, 10, 9, 11, 9, 15, 8, 5, 5,
+	17, 16, 18, 12, 14, 5, 5, 5, 5, 5,
+	0, 1, 2, 9, 3, 4, 15, 2, 2, 2,
+	25, 13, 13, 25, 5, 5, 5, 5, 5, 5}
 };
 
 /** Newer Apple IIGS AGI instrument set (AGI v1.003+). Used by all others than Space Quest I. */
 static const instrumentSetInfo instSetV2 = {
-	1292, 28, "b7d428955bb90721996de1cbca25e768", "c05fb0b0e11deefab58bc68fbd2a3d07"
+	1292, 28, "b7d428955bb90721996de1cbca25e768", "c05fb0b0e11deefab58bc68fbd2a3d07",
+	{21, 22, 24, 25, 23, 26, 6, 6, 6, 6,
+	7, 9, 12, 8, 13, 11, 17, 10, 6, 6,
+	19, 18, 20, 14, 16, 6, 6, 6, 6, 6,
+	0, 1, 2, 4, 3, 5, 17, 2, 2, 2,
+	27, 15, 15, 27, 6, 6, 6, 6, 6, 6}
 };
 
 /** Information about different Apple IIGS AGI executables. */

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2008-04-03 21:42:04 UTC (rev 31370)
+++ scummvm/trunk/engines/agi/sound.h	2008-04-03 22:15:59 UTC (rev 31371)
@@ -323,6 +323,7 @@
 	uint instCount;          ///< Amount of instrument in the set
 	const char *md5;         ///< MD5 hex digest of the whole instrument set
 	const char *waveFileMd5; ///< MD5 hex digest of the wave file (i.e. the sample data used by the instruments)
+	const uint midiProgToInst[50]; ///< Lookup table for the MIDI program number to instrument number mapping
 };
 
 /** Apple IIGS AGI executable file information. */


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