--- np2/win9x/soundmng.cpp 2003/10/30 12:45:38 1.4 +++ np2/win9x/soundmng.cpp 2004/02/03 08:24:40 1.7 @@ -6,6 +6,7 @@ #include "soundmng.h" #include "extromio.h" #include "sound.h" +#include "juliet.h" #if defined(VERMOUTH_LIB) #include "vermouth.h" #endif @@ -74,16 +75,13 @@ UINT soundmng_create(UINT rate, UINT ms) UINT samples; DSBUFFERDESC dsbdesc; PCMWAVEFORMAT pcmwf; -#if defined(VERMOUTH_LIB) - UINT num; -#endif 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; @@ -118,10 +116,7 @@ UINT soundmng_create(UINT rate, UINT ms) #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(); @@ -178,6 +173,7 @@ static void streamenable(BOOL play) { pDSData3->Stop(); } } + juliet_YMF288Enable(play); } void soundmng_play(void) {