--- np2/win9x/soundmng.cpp 2006/12/24 00:52:29 1.12 +++ np2/win9x/soundmng.cpp 2007/10/28 16:01:35 1.15 @@ -14,6 +14,12 @@ #include "mt32snd.h" #endif +#if defined(_M_IA64) || defined(_M_AMD64) +#define SOUNDBUFFERALIGN (1 << 3) +#else +#define SOUNDBUFFERALIGN (1 << 2) +#endif + #if !defined(_WIN64) #ifdef __cplusplus extern "C" { @@ -86,6 +92,7 @@ UINT soundmng_create(UINT rate, UINT ms) (rate != 11025) && (rate != 22050) && (rate != 44100)) { goto stcre_err1; } + if (ms < 40) { ms = 40; } @@ -97,7 +104,7 @@ UINT soundmng_create(UINT rate, UINT ms) // 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); soundmng_setreverse(FALSE); @@ -129,9 +136,11 @@ UINT soundmng_create(UINT rate, UINT ms) vermouth_module = midimod_create(rate); midimod_loadall(vermouth_module); #endif + #if defined(MT32SOUND_DLL) mt32sound_setrate(rate); #endif + dsstreamevent = (UINT8)-1; return(samples);