--- np2/sound/sound.c	2004/02/18 20:11:37	1.14
+++ np2/sound/sound.c	2005/04/05 20:37:07	1.21
@@ -1,4 +1,5 @@
 #include	"compiler.h"
+#include	"wavefile.h"
 #include	"dosio.h"
 #include	"soundmng.h"
 #include	"cpucore.h"
@@ -26,6 +27,9 @@ typedef struct {
 	UINT	samples;
 	UINT	reserve;
 	UINT	remain;
+#if defined(SUPPORT_WAVEREC)
+	WAVEWR	rec;
+#endif
 	CBTBL	*cbreg;
 	CBTBL	cb[STREAM_CBMAX];
 } SNDSTREAM;
@@ -61,6 +65,106 @@ static void streamprepare(UINT samples) 
 }
 
 
+#if defined(SUPPORT_WAVEREC)
+// ---- wave rec
+
+BOOL sound_recstart(const OEMCHAR *filename) {
+
+	WAVEWR	rec;
+
+	sound_recstop();
+	if (sndstream.buffer == NULL) {
+		return(FAILURE);
+	}
+	rec = wavewr_open(filename, soundcfg.rate, 16, 2);
+	sndstream.rec = rec;
+	if (rec) {
+		return(SUCCESS);
+	}
+	return(FAILURE);
+}
+
+void sound_recstop(void) {
+
+	WAVEWR	rec;
+
+	rec = sndstream.rec;
+	sndstream.rec = NULL;
+	wavewr_close(rec);
+}
+
+static void streamfilewrite(UINT samples) {
+
+	CBTBL	*cb;
+	UINT	count;
+	SINT32	buf32[2*512];
+	UINT8	buf[2*2*512];
+	UINT	r;
+	UINT	i;
+	SINT32	samp;
+
+	while(samples) {
+		count = min(samples, 512);
+		ZeroMemory(buf32, count * 2 * sizeof(SINT32));
+		cb = sndstream.cb;
+		while(cb < sndstream.cbreg) {
+			cb->cbfn(cb->hdl, buf32, count);
+			cb++;
+		}
+		r = min(sndstream.remain, count);
+		if (r) {
+			CopyMemory(sndstream.ptr, buf32, r * 2 * sizeof(SINT32));
+			sndstream.ptr += r * 2;
+			sndstream.remain -= r;
+		}
+		for (i=0; i<count*2; i++) {
+			samp = buf32[i];
+			if (samp > 32767) {
+				samp = 32767;
+			}
+			else if (samp < -32768) {
+				samp = -32768;
+			}
+			// little endianなので satuation_s16は使えない
+			buf[i*2+0] = (UINT8)samp;
+			buf[i*2+1] = (UINT8)(samp >> 8);
+		}
+		wavewr_write(sndstream.rec, buf, count * 4);
+		samples -= count;
+	}
+}
+
+static void filltailsample(UINT count) {
+
+	SINT32	*ptr;
+	UINT	orgsize;
+	SINT32	sampl;
+	SINT32	sampr;
+
+	count = min(sndstream.remain, count);
+	if (count) {
+		ptr = sndstream.ptr;
+		orgsize = (ptr - sndstream.buffer) / 2;
+		if (orgsize == 0) {
+			sampl = 0;
+			sampr = 0;
+		}
+		else {
+			sampl = *(ptr - 2);
+			sampr = *(ptr - 1);
+		}
+		sndstream.ptr += count * 2;
+		sndstream.remain -= count;
+		do {
+			ptr[0] = sampl;
+			ptr[1] = sampr;
+			ptr += 2;
+		} while(--count);
+	}
+}
+#endif
+
+
 // ----
 
 BOOL sound_create(UINT rate, UINT ms) {
@@ -114,6 +218,9 @@ scre_err1:
 void sound_destroy(void) {
 
 	if (sndstream.buffer) {
+#if defined(SUPPORT_WAVEREC)
+		sound_recstop();
+#endif
 		soundmng_stop();
 		streamreset();
 		soundmng_destroy();
@@ -153,6 +260,7 @@ void sound_changeclock(void) {
 		clock = (clock + 1) >> 1;
 		hz = (hz + 1) >> 1;
 	}
+	TRACEOUT(("hzbase/clockbase = %d/%d", hz, clock));
 	soundcfg.hzbase = hz;
 	soundcfg.clockbase = clock;
 	soundcfg.minclock = 2 * clock / hz;
@@ -191,7 +299,13 @@ void sound_sync(void) {
 		return;
 	}
 	SNDCSEC_ENTER;
-	streamprepare(length);
+#if defined(SUPPORT_WAVEREC)
+	if (sndstream.rec) {
+		streamfilewrite(length);
+	}
+	else
+#endif
+		streamprepare(length);
 	soundcfg.lastclock += length * soundcfg.clockbase / soundcfg.hzbase;
 	beep_eventreset();
 	SNDCSEC_LEAVE;
@@ -217,7 +331,14 @@ const SINT32 *ret;
 	ret = sndstream.buffer;
 	if (ret) {
 		SNDCSEC_ENTER;
-		if (sndstream.remain > sndstream.reserve) {
+		if (sndstream.remain > sndstream.reserve)
+#if defined(SUPPORT_WAVEREC)
+			if (sndstream.rec) {
+				filltailsample(sndstream.remain - sndstream.reserve);
+			}
+			else
+#endif
+		{
 			streamprepare(sndstream.remain - sndstream.reserve);
 			soundcfg.lastclock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
 			beep_eventreset();
@@ -249,12 +370,12 @@ void sound_pcmunlock(const SINT32 *hdl) 
 }
 
 
-// ----
+// ---- pcmmix
 
-BOOL pcmmix_regist(PMIXDAT *dat, void *datptr, UINT datsize, UINT rate) {
+BRESULT pcmmix_regist(PMIXDAT *dat, void *datptr, UINT datsize, UINT rate) {
 
 	GETSND	gs;
-	BYTE	tmp[256];
+	UINT8	tmp[256];
 	UINT	size;
 	UINT	r;
 	SINT16	*buf;
@@ -300,12 +421,12 @@ pmr_err1:
 	return(FAILURE);
 }
 
-BOOL pcmmix_regfile(PMIXDAT *dat, const char *fname, UINT rate) {
+BRESULT pcmmix_regfile(PMIXDAT *dat, const OEMCHAR *fname, UINT rate) {
 
 	FILEH	fh;
 	UINT	size;
-	BYTE	*ptr;
-	BOOL	r;
+	UINT8	*ptr;
+	BRESULT	r;
 
 	r = FAILURE;
 	fh = file_open_rb(fname);
@@ -316,7 +437,7 @@ BOOL pcmmix_regfile(PMIXDAT *dat, const 
 	if (size == 0) {
 		goto pmrf_err2;
 	}
-	ptr = (BYTE *)_MALLOC(size, fname);
+	ptr = (UINT8 *)_MALLOC(size, fname);
 	if (ptr == NULL) {
 		goto pmrf_err2;
 	}