--- np2/sound/vermouth/vermouth.h	2006/12/10 11:14:31	1.5
+++ np2/sound/vermouth/vermouth.h	2011/02/04 01:59:32	1.10
@@ -2,9 +2,13 @@
 #ifndef __VERMOUTH_H
 #define	__VERMOUTH_H
 
+#ifndef VERMOUTHCL
+#define	VERMOUTHCL
+#endif
+
 #ifndef VERMOUTH_EXPORTS
 #define	VEXTERN
-#define	VEXPORT
+#define	VEXPORT		VERMOUTHCL
 #else
 #define	VEXTERN		__declspec(dllexport)
 #define	VEXPORT		WINAPI
@@ -26,7 +30,7 @@ typedef struct {
 	UINT	bank;
 	UINT	num;
 } MIDIOUTLAEXPARAM;
-typedef int (*FNMIDIOUTLAEXCB)(MIDIOUTLAEXPARAM *param);
+typedef BRESULT (*FNMIDIOUTLAEXCB)(MIDIOUTLAEXPARAM *param);
 
 
 #ifdef __cplusplus
@@ -34,7 +38,7 @@ extern "C" {
 #endif
 
 VEXTERN UINT VEXPORT midiout_getver(char *string, int leng);
-VEXTERN MIDIHDL VEXPORT midiout_create(MIDIMOD module, UINT worksize);
+VEXTERN MIDIHDL VEXPORT midiout_create(MIDIMOD mod, UINT worksize);
 VEXTERN void VEXPORT midiout_destroy(MIDIHDL hdl);
 VEXTERN void VEXPORT midiout_shortmsg(MIDIHDL hdl, UINT32 msg);
 VEXTERN void VEXPORT midiout_longmsg(MIDIHDL hdl, const void *msg, UINT size);
@@ -47,11 +51,13 @@ VEXTERN void VEXPORT midiout_setportb(MI
 
 VEXTERN MIDIMOD VEXPORT midimod_create(UINT samprate);
 VEXTERN void VEXPORT midimod_destroy(MIDIMOD hdl);
+VEXTERN void VEXPORT midimod_destroy(MIDIMOD hdl);
+VEXTERN BRESULT VEXPORT midimod_cfgload(MIDIMOD mod, const OEMCHAR *filename);
 VEXTERN void VEXPORT midimod_loadprogram(MIDIMOD hdl, UINT num);
 VEXTERN void VEXPORT midimod_loadrhythm(MIDIMOD hdl, UINT num);
 VEXTERN void VEXPORT midimod_loadgm(MIDIMOD hdl);
 VEXTERN void VEXPORT midimod_loadall(MIDIMOD hdl);
-VEXTERN void VEXPORT midimod_loadallex(MIDIMOD hdl, FNMIDIOUTLAEXCB cb, void *userdata);
+VEXTERN int VEXPORT midimod_loadallex(MIDIMOD hdl, FNMIDIOUTLAEXCB cb, void *userdata);
 
 #ifdef __cplusplus
 }