[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.22,1.23

[James Brown]

Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv27822/sound

Modified Files:
	imuse.cpp 
Log Message:
Update midi MT-32 patch table.



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** imuse.cpp	14 Apr 2002 18:13:08 -0000	1.22
--- imuse.cpp	18 Apr 2002 06:22:18 -0000	1.23
***************
*** 38,43 ****
--- 38,46 ----
  #define MDHD_TAG "MDhd"
  
+ 
+ 
  /* Roland to General Midi patch table. Still needs much work. */
  static const byte mt32_to_gmidi[128] = {
+ 	/*
    0,   1,   2,   4,   4,   5,   5,   3,  16,  17,  18,  18,  19,
    19,  20,  21,   6,   6,   6,   7,   7,   7,   8,   8,  62,  63,
***************
*** 50,53 ****
--- 53,66 ----
    12, 107, 111,  77,  78,  78,  76, 121,  47, 117, 127, 115, 118,
   116, 118,  94, 115,   9,  55, 124, 123, 125, 126, 127
+  */
+  0, 1, 0, 2, 4, 4, 5, 3, 16, 17, 18, 16, 16, 19, 20, 21, 6, 6, 6,
+  7, 7, 7, 8, 112, 62, 62, 63, 63, 38, 38, 39, 39, 88, 54, 52, 98,
+  97,99,14,54, 102, 96, 53, 102, 81, 100, 14, 80, 48, 48, 49, 45,
+  41, 40, 42, 42, 43, 46, 45, 24, 25, 28, 27, 104, 32, 32, 34, 33,
+  36, 37, 35, 35, 79, 73, 72, 72, 74, 75, 64, 65, 66, 67, 71, 71,
+  68, 69, 70, 22, 56, 59, 57, 57, 60, 60, 58, 61, 61, 11, 11, 98,
+  14, 9, 14, 13, 12, 107, 107, 77, 78, 78, 76, 76, 47, 117, 127,
+  118, 118, 116, 119, 115, 112, 55, 124, 123, 0, 14, 117
+ 
  };
  
***************
*** 4148,4157 ****
  void IMuseGM::midiProgram(byte chan, byte program)
  {
! 	if ((chan + 1) != 10) {				/* Ignore percussion prededed by patch change */
  		if (_se->_mt32emulate)
  			program = mt32_to_gmidi[program];
  
  		_md->send(program << 8 | 0xC0 | chan);
! 	}
  }
  
--- 4161,4170 ----
  void IMuseGM::midiProgram(byte chan, byte program)
  {
! //	if ((chan + 1) != 10) {				/* Ignore percussion prededed by patch change */
  		if (_se->_mt32emulate)
  			program = mt32_to_gmidi[program];
  
  		_md->send(program << 8 | 0xC0 | chan);
! //	}
  }