--- np2/generic/cmver.c	2003/11/21 06:51:11	1.1
+++ np2/generic/cmver.c	2006/12/23 09:48:11	1.5
@@ -13,7 +13,7 @@
 #define MIDIOUTS2(a)		((a)[0] + ((a)[1] << 8))
 #define MIDIOUTS3(a)		((a)[0] + ((a)[1] << 8) + ((a)[2] << 16))
 
-static const BYTE EXCV_GMRESET[] = {
+static const UINT8 EXCV_GMRESET[] = {
 			0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7};
 
 enum {
@@ -21,6 +21,7 @@ enum {
 	MIDI_TIMECODE		= 0xf1,
 	MIDI_SONGPOS		= 0xf2,
 	MIDI_SONGSELECT		= 0xf3,
+	MIDI_CABLESELECT	= 0xf5,
 	MIDI_TUNEREQUEST	= 0xf6,
 	MIDI_EOX			= 0xf7,
 	MIDI_TIMING			= 0xf8,
@@ -44,10 +45,10 @@ enum {
 };
 
 typedef struct {
-	BYTE	prog;
-	BYTE	press;
+	UINT8	prog;
+	UINT8	press;
 	UINT16	bend;
-	BYTE	ctrl[28];
+	UINT8	ctrl[28];
 } _MIDICH, *MIDICH;
 
 typedef struct {
@@ -55,9 +56,9 @@ typedef struct {
 	UINT		midictrl;
 	UINT		midisyscnt;
 	UINT		mpos;
-	BYTE		midilast;
+	UINT8		midilast;
 	_MIDICH		mch[16];
-	BYTE		buffer[MIDI_BUFFER];
+	UINT8		buffer[MIDI_BUFFER];
 } _CMMIDI, *CMMIDI;
 
 typedef struct {
@@ -65,13 +66,13 @@ typedef struct {
 	UINT	rate;
 } CMVER;
 
-static const BYTE midictrltbl[] = {	0, 1, 5, 7, 10, 11, 64,
+static const UINT8 midictrltbl[] = { 0, 1, 5, 7, 10, 11, 64,
 									65, 66, 67, 84, 91, 93,
 									94,						// for SC-88
 									71, 72, 73, 74};		// for XG
 
 static	CMVER	cmver;
-static	BYTE	midictrlindex[128];
+static	UINT8	midictrlindex[128];
 
 
 // ----
@@ -99,7 +100,7 @@ const SINT32	*ptr;
 
 static void midireset(CMMIDI midi) {
 
-	BYTE	work[4];
+	UINT8	work[4];
 
 	midiout_longmsg(midi->midihdl, EXCV_GMRESET, sizeof(EXCV_GMRESET));
 
@@ -114,7 +115,7 @@ static void midireset(CMMIDI midi) {
 
 static void midisetparam(CMMIDI midi) {
 
-	BYTE	i;
+	UINT8	i;
 	UINT	j;
 	MIDICH	mch;
 
@@ -127,7 +128,7 @@ static void midisetparam(CMMIDI midi) {
 		if (mch->bend != 0xffff) {
 			midiout_shortmsg(midi->midihdl, (mch->bend << 8) + 0xe0+i);
 		}
-		for (j=0; j<sizeof(midictrltbl)/sizeof(BYTE); j++) {
+		for (j=0; j<NELEMENTS(midictrltbl); j++) {
 			if (mch->ctrl[j+1] != 0xff) {
 				midiout_shortmsg(midi->midihdl,
 							MIDIOUTS(0xb0+i, midictrltbl[j], mch->ctrl[j+1]));
@@ -142,14 +143,14 @@ static void midisetparam(CMMIDI midi) {
 
 // ----
 
-static UINT midiread(COMMNG self, BYTE *data) {
+static UINT midiread(COMMNG self, UINT8 *data) {
 
 	(void)self;
 	(void)data;
 	return(0);
 }
 
-static UINT midiwrite(COMMNG self, BYTE data) {
+static UINT midiwrite(COMMNG self, UINT8 data) {
 
 	CMMIDI	midi;
 	MIDICH	mch;
@@ -202,11 +203,12 @@ static UINT midiwrite(COMMNG self, BYTE 
 							midi->midisyscnt = 2;
 							break;
 
-						case MIDI_TUNEREQUEST:
+						case MIDI_CABLESELECT:
 							midi->midictrl = MIDICTRL_SYSTEM;
 							midi->midisyscnt = 1;
 							break;
 
+//						case MIDI_TUNEREQUEST:
 //						case MIDI_EOX:
 						default:
 							return(1);
@@ -256,12 +258,12 @@ static UINT midiwrite(COMMNG self, BYTE 
 						if (midi->buffer[1] == 123) {
 							mch->press = 0;
 							mch->bend = 0x4000;
-							mch->ctrl[1] = 0;			// Modulation
-							mch->ctrl[5] = 127;			// Explession
-							mch->ctrl[6] = 0;			// Hold
-							mch->ctrl[7] = 0;			// Portament
-							mch->ctrl[8] = 0;			// Sostenute
-							mch->ctrl[9] = 0;			// Soft
+							mch->ctrl[1+1] = 0;			// Modulation
+							mch->ctrl[5+1] = 127;		// Explession
+							mch->ctrl[6+1] = 0;			// Hold
+							mch->ctrl[7+1] = 0;			// Portament
+							mch->ctrl[8+1] = 0;			// Sostenute
+							mch->ctrl[9+1] = 0;			// Soft
 						}
 						else {
 							mch->ctrl[midictrlindex[midi->buffer[1]]]
@@ -315,7 +317,7 @@ static UINT midiwrite(COMMNG self, BYTE 
 	return(0);
 }
 
-static BYTE midigetstat(COMMNG self) {
+static UINT8 midigetstat(COMMNG self) {
 
 	return(0x00);
 }
@@ -375,8 +377,8 @@ void cmvermouth_initialize(void) {
 	UINT	i;
 
 	ZeroMemory(midictrlindex, sizeof(midictrlindex));
-	for (i=0; i<sizeof(midictrltbl)/sizeof(BYTE); i++) {
-		midictrlindex[midictrltbl[i]] = (BYTE)(i + 1);
+	for (i=0; i<NELEMENTS(midictrltbl); i++) {
+		midictrlindex[midictrltbl[i]] = (UINT8)(i + 1);
 	}
 	midictrlindex[32] = 1;
 }
@@ -384,7 +386,6 @@ void cmvermouth_initialize(void) {
 void cmvermouth_load(UINT rate) {
 
 	MIDIMOD	vermouth;
-	UINT	num;
 
 	if (rate == 0) {
 		return;
@@ -394,10 +395,7 @@ void cmvermouth_load(UINT rate) {
 		cmver.rate = rate;
 		vermouth = midimod_create(rate);
 		cmver.vermouth = vermouth;
-		for (num=0; num<128; num++) {
-			midimod_loadprogram(vermouth, num);
-			midimod_loadrhythm(vermouth, num);
-		}
+		midimod_loadall(vermouth);
 	}
 }