--- np2/sound/vermouth/midiout.h	2003/11/15 07:10:03	1.2
+++ np2/sound/vermouth/midiout.h	2003/11/30 12:32:04	1.5
@@ -1,9 +1,9 @@
 
-#define	MIDI_GMONLY
-
-#if !defined(_WIN32_CE) && !defined(SLZAURUS)
+#if !defined(_WIN32_WCE) && !defined(SLZAURUS)
 #define	ENABLE_TREMOLO
 #define	ENABLE_VIRLATE
+#else
+#define	MIDI_GMONLY
 #endif
 
 struct _midimodule;
@@ -70,7 +70,7 @@ struct _midictrl {
 	UINT		worksize;
 	int			level;
 	BYTE		status;
-	char		gain;
+	SINT8		gain;
 	BYTE		master;
 
 	MIDIMOD		module;
@@ -101,6 +101,8 @@ 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);