--- np2/fdd/fdd_mtr.c 2003/10/16 17:58:29 1.1.1.1 +++ np2/fdd/fdd_mtr.c 2004/01/13 05:30:58 1.3 @@ -2,6 +2,9 @@ #include "soundmng.h" #include "pccore.h" #include "fdd_mtr.h" +#if defined(SUPPORT_WAVEMIX) +#include "wavemix.h" +#endif int fddmtr_biosbusy = 0; // ver0.26 @@ -20,7 +23,11 @@ static void fddmtr_event(void) { switch(mtr_curevent) { case 100: +#if defined(SUPPORT_WAVEMIX) + wavemix_stop(SOUND_PCMSEEK); +#else soundmng_pcmstop(SOUND_PCMSEEK); +#endif mtr_curevent = 0; break; @@ -59,7 +66,7 @@ void fddmtr_seek(BYTE drv, BYTE c, UINT FDC_HEAD[curdrv] = c; } if (!np2cfg.MOTOR) { - SINT32 s = size * pc.multiple; + SINT32 s = size * pccore.multiple; if (s) { // ver0.28 fddmtr_biosbusy = 1; nevent_set(NEVENT_FDBIOSBUSY, s, fdbiosout, NEVENT_ABSOLUTE); @@ -73,7 +80,11 @@ void fddmtr_seek(BYTE drv, BYTE c, UINT if (regmove == 1) { if (mtr_curevent < 80) { fddmtr_event(); +#if defined(SUPPORT_WAVEMIX) + wavemix_play(SOUND_PCMSEEK1, FALSE); +#else soundmng_pcmplay(SOUND_PCMSEEK1, FALSE); +#endif mtr_curevent = 80; nextevent = GETTICK() + MOVEMOTOR1_MS; } @@ -81,7 +92,11 @@ void fddmtr_seek(BYTE drv, BYTE c, UINT else if (regmove) { if (mtr_curevent < 100) { fddmtr_event(); +#if defined(SUPPORT_WAVEMIX) + wavemix_play(SOUND_PCMSEEK, TRUE); +#else soundmng_pcmplay(SOUND_PCMSEEK, TRUE); +#endif mtr_curevent = 100; nextevent = GETTICK() + (regmove * MOVE1TCK_MS); }