--- np2/sound/vermouth/midiout.h	2003/10/16 17:58:09	1.1
+++ np2/sound/vermouth/midiout.h	2005/03/18 09:23:11	1.7
@@ -1,7 +1,10 @@
 
-#define	MIDI_GMONLY
+#if !defined(_WIN32_WCE) && !defined(SLZAURUS)
 #define	ENABLE_TREMOLO
 #define	ENABLE_VIRLATE
+#else
+#define	MIDI_GMONLY
+#endif
 
 struct _midimodule;
 typedef	struct _midimodule	_MIDIMOD;
@@ -66,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];
@@ -92,17 +95,19 @@ struct _midictrl {
 extern "C" {
 #endif
 
-AEXTERN UINT AEXPORT midiout_getver(char *string, int leng);
+AEXTERN UINT AEXPORT midiout_getver(OEMCHAR *string, int leng);
 
 AEXTERN _MIDIMOD AEXPORT * midimod_create(UINT samprate);
 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);