--- np2/sound/vermouth/midiout.h	2003/11/21 06:51:14	1.3
+++ np2/sound/vermouth/midiout.h	2005/02/07 14:46:13	1.6
@@ -1,9 +1,9 @@
 
-#define	MIDI_GMONLY
-
 #if !defined(_WIN32_WCE) && !defined(SLZAURUS)
 #define	ENABLE_TREMOLO
 #define	ENABLE_VIRLATE
+#else
+#define	MIDI_GMONLY
 #endif
 
 struct _midimodule;
@@ -69,9 +69,9 @@ struct _midictrl {
 	UINT		samprate;
 	UINT		worksize;
 	int			level;
-	BYTE		status;
-	char		gain;
-	BYTE		master;
+	UINT8		status;
+	SINT8		gain;
+	UINT8		master;
 
 	MIDIMOD		module;
 	INSTRUMENT	*bank0[2];
@@ -101,11 +101,13 @@ AEXTERN _MIDIMOD AEXPORT * midimod_creat
 AEXTERN void AEXPORT midimod_destroy(MIDIMOD hdl);
 AEXTERN void AEXPORT midimod_loadprogram(MIDIMOD hdl, UINT num);
 AEXTERN void AEXPORT midimod_loadrhythm(MIDIMOD hdl, UINT num);
+AEXTERN void AEXPORT midimod_loadgm(MIDIMOD hdl);
+AEXTERN void AEXPORT midimod_loadall(MIDIMOD hdl);
 
 AEXTERN _MIDIHDL AEXPORT * midiout_create(MIDIMOD module, UINT worksize);
 AEXTERN void AEXPORT midiout_destroy(MIDIHDL hdl);
 AEXTERN void AEXPORT midiout_shortmsg(MIDIHDL hdl, UINT32 msg);
-AEXTERN void AEXPORT midiout_longmsg(MIDIHDL hdl, const BYTE *msg, UINT size);
+AEXTERN void AEXPORT midiout_longmsg(MIDIHDL hdl, const UINT8 *msg, UINT size);
 AEXTERN const SINT32 AEXPORT * midiout_get(MIDIHDL hdl, UINT *samples);
 AEXTERN UINT AEXPORT midiout_get32(MIDIHDL hdl, SINT32 *pcm, UINT size);
 AEXTERN void AEXPORT midiout_setgain(MIDIHDL hdl, int gain);