--- np2/sound/vermouth/midimod.c	2005/03/18 09:23:11	1.6
+++ np2/sound/vermouth/midimod.c	2006/12/16 09:43:24	1.9
@@ -3,6 +3,9 @@
 #include	"dosio.h"
 #include	"textfile.h"
 #include	"midiout.h"
+#if defined(SUPPORT_ARC)
+#include	"arc.h"
+#endif
 
 
 #define	CFG_MAXAMP		400
@@ -36,6 +39,7 @@ static const OEMCHAR str_env[] = OEMTEXT
 static const OEMCHAR str_loop[] = OEMTEXT("loop");
 static const OEMCHAR str_tail[] = OEMTEXT("tail");
 static const OEMCHAR file_timiditycfg[] = OEMTEXT("timidity.cfg");
+static const OEMCHAR str_basedir[] = OEMTEXT("${basedir}");
 
 
 static void pathadd(MIDIMOD mod, const OEMCHAR *path) {
@@ -49,7 +53,10 @@ static void pathadd(MIDIMOD mod, const O
 		// separator change!
 		file_catname(pl.path, path, NELEMENTS(pl.path));
 		if (path[0]) {
-			file_setseparator(pl.path, NELEMENTS(pl.path));
+#if defined(SUPPORT_ARC)
+			if (milstr_chr(pl.path, '#') == NULL)
+#endif
+				file_setseparator(pl.path, NELEMENTS(pl.path));
 		}
 	}
 
@@ -67,6 +74,21 @@ static void pathadd(MIDIMOD mod, const O
 	}
 }
 
+static void pathaddex(MIDIMOD mod, const OEMCHAR *path) {
+
+	OEMCHAR	_path[MAX_PATH];
+
+	if (milstr_memcmp(path, str_basedir)) {
+		pathadd(mod, path);
+	}
+	else {
+		file_cpyname(_path, file_getcd(str_null), NELEMENTS(_path));
+		file_cutseparator(_path);
+		file_catname(_path, path + 10, NELEMENTS(_path));
+		pathadd(mod, _path);
+	}
+}
+
 static int cfggetarg(OEMCHAR *str, OEMCHAR *arg[], int maxarg) {
 
 	int		ret;
@@ -324,7 +346,11 @@ BRESULT cfgfile_getfile(MIDIMOD mod, con
 	while(p) {
 		file_cpyname(path, p->path, size);
 		file_catname(path, filename, size);
+#if defined(SUPPORT_ARC)
+		attr = arcex_attr(path);
+#else
 		attr = file_attr(path);
+#endif
 		if (attr != -1) {
 			return(SUCCESS);
 		}
@@ -372,7 +398,7 @@ BRESULT cfgfile_load(MIDIMOD mod, const 
 		switch(cfg) {
 			case CFG_DIR:
 				for (i=1; i<argc; i++) {
-					pathadd(mod, argv[i]);
+					pathaddex(mod, argv[i]);
 				}
 				break;
 
@@ -414,7 +440,7 @@ cfl_err:
 
 // ----
 
-MIDIMOD midimod_create(UINT samprate) {
+VEXTERN MIDIMOD VEXPORT midimod_create(UINT samprate) {
 
 	UINT	size;
 	MIDIMOD	ret;
@@ -433,7 +459,7 @@ MIDIMOD midimod_create(UINT samprate) {
 	ret->tone[1] = ret->tone[0] + 128;
 	ret->tonecfg[0] = (TONECFG)(ret->tone[1] + 128);
 	ret->tonecfg[1] = ret->tonecfg[0] + 128;
-	ret->pathtbl = listarray_new(sizeof(_PATHLIST), 64);
+	ret->pathtbl = listarray_new(sizeof(_PATHLIST), 16);
 	pathadd(ret, NULL);
 	pathadd(ret, file_getcd(str_null));
 	ret->namelist = listarray_new(MAX_NAME, 128);
@@ -446,6 +472,7 @@ MIDIMOD midimod_create(UINT samprate) {
 	if (r != SUCCESS) {
 		goto mmcre_err2;
 	}
+	midimod_lock(ret);
 	return(ret);
 
 mmcre_err2:
@@ -457,30 +484,48 @@ mmcre_err1:
 	return(NULL);
 }
 
-void midimod_destroy(MIDIMOD hdl) {
+void midimod_lock(MIDIMOD hdl) {
+
+	hdl->lockcount++;
+}
+
+void midimod_unlock(MIDIMOD hdl) {
 
 	UINT	r;
 	TONECFG	bank;
 
+	if (!hdl->lockcount) {
+		return;
+	}
+	hdl->lockcount--;
+	if (hdl->lockcount) {
+		return;
+	}
+
+	r = 128;
+	do {
+		r--;
+		inst_bankfree(hdl, r);
+	} while(r > 0);
+	for (r=2; r<(MIDI_BANKS*2); r++) {
+		bank = hdl->tonecfg[r];
+		if (bank) {
+			_MFREE(bank);
+		}
+	}
+	listarray_destroy(hdl->namelist);
+	listarray_destroy(hdl->pathtbl);
+	_MFREE(hdl);
+}
+
+VEXTERN void VEXPORT midimod_destroy(MIDIMOD hdl) {
+
 	if (hdl) {
-		r = 128;
-		do {
-			r--;
-			inst_bankfree(hdl, r);
-		} while(r > 0);
-		for (r=2; r<(MIDI_BANKS*2); r++) {
-			bank = hdl->tonecfg[r];
-			if (bank) {
-				_MFREE(bank);
-			}
-		}
-		listarray_destroy(hdl->namelist);
-		listarray_destroy(hdl->pathtbl);
-		_MFREE(hdl);
+		midimod_unlock(hdl);
 	}
 }
 
-void midimod_loadprogram(MIDIMOD hdl, UINT num) {
+VEXTERN void VEXPORT midimod_loadprogram(MIDIMOD hdl, UINT num) {
 
 	UINT	bank;
 
@@ -493,7 +538,7 @@ void midimod_loadprogram(MIDIMOD hdl, UI
 	}
 }
 
-void midimod_loadrhythm(MIDIMOD hdl, UINT num) {
+VEXTERN void VEXPORT midimod_loadrhythm(MIDIMOD hdl, UINT num) {
 
 	UINT	bank;
 
@@ -506,7 +551,7 @@ void midimod_loadrhythm(MIDIMOD hdl, UIN
 	}
 }
 
-void midimod_loadgm(MIDIMOD hdl) {
+VEXTERN void VEXPORT midimod_loadgm(MIDIMOD hdl) {
 
 	if (hdl) {
 		inst_bankload(hdl, 0);
@@ -514,7 +559,7 @@ void midimod_loadgm(MIDIMOD hdl) {
 	}
 }
 
-void midimod_loadall(MIDIMOD hdl) {
+VEXTERN void VEXPORT midimod_loadall(MIDIMOD hdl) {
 
 	UINT	b;
 
@@ -525,3 +570,22 @@ void midimod_loadall(MIDIMOD hdl) {
 	}
 }
 
+
+VEXTERN void VEXPORT midimod_loadallex(MIDIMOD hdl, FNMIDIOUTLAEXCB cb, void *userdata) {
+
+	MIDIOUTLAEXPARAM param;
+	UINT	b;
+
+	if (hdl) {
+		ZeroMemory(&param, sizeof(param));
+		param.userdata = userdata;
+		for (b=0; b<(MIDI_BANKS*2); b++) {
+			param.totaltones += inst_gettones(hdl, b);
+		}
+		for (b=0; b<(MIDI_BANKS*2); b++) {
+			param.bank = b;
+			inst_bankloadex(hdl, b, cb, &param);
+		}
+	}
+}
+