X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fxa.c;h=124138084f64d2f002e7d2659b82ef8a896e284d;hp=704847b4d9343e93ee4cbe0c7ca10c96bd209854;hb=011755d7a88f7128d04a14136e9fd61870706dcf;hpb=3154bfab51566cbaa5bce3965d4c915bfb1b4f53 diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 704847b4..12413808 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -38,12 +38,12 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0}; // MIX XA & CDDA //////////////////////////////////////////////////////////////////////// -INLINE void MixXA(int ns_to) +INLINE void MixXA(int ns_to, int decode_pos) { + int cursor = decode_pos; int ns; short l, r; uint32_t v; - int cursor = spu.decode_pos; if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0) { @@ -90,9 +90,13 @@ INLINE void MixXA(int ns_to) static unsigned long timeGetTime_spu() { +#ifdef _WIN32 + return GetTickCount(); +#else struct timeval tv; gettimeofday(&tv, 0); // well, maybe there are better ways return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works +#endif } ////////////////////////////////////////////////////////////////////////