aboutsummaryrefslogtreecommitdiff
path: root/plugins/dfsound/xa.c
diff options
context:
space:
mode:
authornotaz2015-01-25 23:21:40 +0200
committernotaz2015-01-25 23:21:40 +0200
commit4e9adec1930817da2031fd044dc74c0f454a0079 (patch)
tree854c202544c75e486d4243b34366162f03f082eb /plugins/dfsound/xa.c
parentbe1294d017cba3f18cf66597f0cbed207fed26bf (diff)
parentba10822d813767632c528102055e3eeb54730b2c (diff)
downloadpcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.gz
pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.bz2
pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.zip
Merge branch 'upstream' into libretro
Diffstat (limited to 'plugins/dfsound/xa.c')
-rw-r--r--plugins/dfsound/xa.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 704847b..ad7e824 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 *SSumLR, 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,15 @@ INLINE void MixXA(int ns_to)
static unsigned long timeGetTime_spu()
{
+#if defined(NO_OS)
+ return 0;
+#elif defined(_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
}
////////////////////////////////////////////////////////////////////////