--- np2/win9x/soundmng.cpp	2003/10/18 10:28:12	1.2
+++ np2/win9x/soundmng.cpp	2007/01/08 01:16:59	1.13
@@ -6,9 +6,29 @@
 #include	"soundmng.h"
 #include	"extromio.h"
 #include	"sound.h"
+#include	"juliet.h"
 #if defined(VERMOUTH_LIB)
 #include	"vermouth.h"
 #endif
+#if defined(MT32SOUND_DLL)
+#include	"mt32snd.h"
+#endif
+
+#if !defined(_WIN64)
+#define	SOUNDBUFFERALIGN	(1 << 2)
+#else
+#define	SOUNDBUFFERALIGN	(1 << 3)
+#endif
+
+#if !defined(_WIN64)
+#ifdef __cplusplus
+extern "C" {
+#endif
+void __fastcall satuation_s16mmx(SINT16 *dst, const SINT32 *src, UINT size);
+#ifdef __cplusplus
+}
+#endif
+#endif
 
 
 #if 1
@@ -28,9 +48,9 @@
 static	LPDIRECTSOUND		pDSound;
 static	LPDIRECTSOUNDBUFFER	pDSData3;
 static	UINT				dsstreambytes;
-static	BYTE				dsstreamevent;
+static	UINT8				dsstreamevent;
 static	LPDIRECTSOUNDBUFFER pDSwave3[SOUND_MAXPCM];
-static	BYTE				mute;
+static	UINT				mute;
 static	void				(PARTSCALL *fnmix)(SINT16 *dst,
 												const SINT32 *src, UINT size);
 
@@ -41,7 +61,7 @@ static	void				(PARTSCALL *fnmix)(SINT16
 
 // ---- directsound
 
-static BOOL dsoundcreate(void) {
+static BRESULT dsoundcreate(void) {
 
 	// DirectSoundの初期化
 	if (FAILED(DirectSoundCreate(0, &pDSound, 0))) {
@@ -66,28 +86,26 @@ UINT soundmng_create(UINT rate, UINT ms)
 	UINT			samples;
 	DSBUFFERDESC	dsbdesc;
 	PCMWAVEFORMAT	pcmwf;
-#if defined(VERMOUTH_LIB)
-	UINT			num;
-#endif
+	int				i;
 
 	if ((pDSound == NULL) ||
 		(rate != 11025) && (rate != 22050) && (rate != 44100)) {
 		goto stcre_err1;
 	}
-	if (ms < 50) {
-		ms = 50;
+	if (ms < 40) {
+		ms = 40;
 	}
 	else if (ms > 1000) {
 		ms = 1000;
 	}
 
 	// キーボード表示のディレイ設定
-//	keydispr_delayinit((BYTE)((ms * 10 + 563) / 564));
+//	keydispr_delayinit((UINT8)((ms * 10 + 563) / 564));
 
 	samples = (rate * ms) / 2000;
-	samples = (samples + 3) & (~3);
+	samples = (samples + SOUNDBUFFERALIGN - 1) & (~(SOUNDBUFFERALIGN - 1));
 	dsstreambytes = samples * 2 * sizeof(SINT16);
-	fnmix = satuation_s16;
+	soundmng_setreverse(FALSE);
 
 	ZeroMemory(&pcmwf, sizeof(PCMWAVEFORMAT));
 	pcmwf.wf.wFormatTag = WAVE_FORMAT_PCM;
@@ -97,26 +115,30 @@ UINT soundmng_create(UINT rate, UINT ms)
 	pcmwf.wf.nBlockAlign = 2 * sizeof(SINT16);
 	pcmwf.wf.nAvgBytesPerSec = rate * 2 * sizeof(SINT16);
 
-	ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));
-	dsbdesc.dwSize = DSBUFFERDESC_SIZE;
-	dsbdesc.dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME |
+	for (i=0; i<2; i++) {
+		ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));
+		dsbdesc.dwSize = i ? sizeof(dsbdesc) : DSBUFFERDESC_SIZE;
+		dsbdesc.dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME |
 						DSBCAPS_CTRLFREQUENCY |
 						DSBCAPS_STICKYFOCUS | DSBCAPS_GETCURRENTPOSITION2;
-	dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
-	dsbdesc.dwBufferBytes = dsstreambytes * 2;
-	if (FAILED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {
+		dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
+		dsbdesc.dwBufferBytes = dsstreambytes * 2;
+		if (SUCCEEDED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {
+			break;
+		}
+	}
+	if (i >= 2) {
 		goto stcre_err2;
 	}
 
 #if defined(VERMOUTH_LIB)
 	vermouth_module = midimod_create(rate);
-	for (num=0; num<128; num++) {
-		midimod_loadprogram(vermouth_module, num);
-		midimod_loadrhythm(vermouth_module, num);
-	}
+	midimod_loadall(vermouth_module);
 #endif
-	dsstreamevent = (BYTE)-1;
-	soundmng_reset();
+#if defined(MT32SOUND_DLL)
+	mt32sound_setrate(rate);
+#endif
+	dsstreamevent = (UINT8)-1;
 	return(samples);
 
 stcre_err2:
@@ -143,7 +165,7 @@ void soundmng_reset(void) {
 		}
 		pDSData3->Unlock(blockptr1, blocksize1, blockptr2, blocksize2);
 		pDSData3->SetCurrentPosition(0);
-		dsstreamevent = (BYTE)-1;
+		dsstreamevent = (UINT8)-1;
 	}
 }
 
@@ -154,6 +176,9 @@ void soundmng_destroy(void) {
 		midimod_destroy(vermouth_module);
 		vermouth_module = NULL;
 #endif
+#if defined(MT32SOUND_DLL)
+		mt32sound_setrate(0);
+#endif
 		pDSData3->Stop();
 		pDSData3->Release();
 		pDSData3 = NULL;
@@ -170,6 +195,7 @@ static void streamenable(BOOL play) {
 			pDSData3->Stop();
 		}
 	}
+	juliet_YMF288Enable(play);
 }
 
 void soundmng_play(void) {
@@ -242,7 +268,21 @@ void soundmng_sync(void) {
 
 void soundmng_setreverse(BOOL reverse) {
 
-	fnmix = (reverse)?satuation_s16x:satuation_s16;
+	if (!reverse) {
+#if !defined(_WIN64)
+		if (mmxflag) {
+			fnmix = satuation_s16;
+		}
+		else {
+			fnmix = satuation_s16mmx;
+		}
+#else
+		fnmix = satuation_s16;
+#endif
+	}
+	else {
+		fnmix = satuation_s16x;
+	}
 }
 
 
@@ -283,7 +323,7 @@ static void pcmstop(void) {
 	}
 }
 
-void soundmng_pcmload(UINT num, const char *filename, UINT type) {
+void soundmng_pcmload(UINT num, const OEMCHAR *filename, UINT type) {
 
 	EXTROMH				erh;
 	RIFF_HEADER			riff;
@@ -394,7 +434,7 @@ void soundmng_pcmvolume(UINT num, int vo
 	}
 }
 
-BOOL soundmng_pcmplay(UINT num, BOOL loop) {
+BRESULT soundmng_pcmplay(UINT num, BOOL loop) {
 
 	LPDIRECTSOUNDBUFFER	dsbuf;
 
@@ -424,12 +464,15 @@ void soundmng_pcmstop(UINT num) {
 
 // ----
 
-BOOL soundmng_initialize(void) {
+BRESULT soundmng_initialize(void) {
 
 	if (dsoundcreate() != SUCCESS) {
 		goto smcre_err;
 	}
 	pcmcreate();
+#if defined(MT32SOUND_DLL)
+	mt32sound_initialize();
+#endif
 	return(SUCCESS);
 
 smcre_err:
@@ -439,6 +482,9 @@ smcre_err:
 
 void soundmng_deinitialize(void) {
 
+#if defined(MT32SOUND_DLL)
+	mt32sound_deinitialize();
+#endif
 	pcmdestroy();
 	soundmng_destroy();
 	RELEASE(pDSound);
@@ -447,21 +493,24 @@ void soundmng_deinitialize(void) {
 
 // ----
 
-void soundmng_enable(void) {
+void soundmng_enable(UINT proc) {
 
-	if (mute) {
-		mute = 0;
+	if (!(mute & (1 << proc))) {
+		return;
+	}
+	mute &= ~(1 << proc);
+	if (!mute) {
 		soundmng_reset();
 		streamenable(TRUE);
 	}
 }
 
-void soundmng_disable(void) {
+void soundmng_disable(UINT proc) {
 
 	if (!mute) {
-		mute = 1;
 		streamenable(FALSE);
 		pcmstop();
 	}
+	mute |= 1 << proc;
 }