From 003cfc63c69b3e900de768317354dfb80bbf6a55 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 3 Jan 2015 02:22:14 +0200 Subject: mingw build fixes --- plugins/dfsound/xa.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/dfsound/xa.c') diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 704847b..9b7ed5a 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -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 } //////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 215ff9e69c0b845f24e7a3aa9faeef06d9276145 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 27 Dec 2014 23:24:15 +0200 Subject: spu: handle stop better, split main func more --- plugins/dfsound/xa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/dfsound/xa.c') diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 9b7ed5a..1241380 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) { -- cgit v1.2.3 From de4a0279efefdd2e4595c8fc27f1564f4bff9341 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 5 Jan 2015 04:27:03 +0200 Subject: spu: finish offload code to TI C64x DSP rather disappointing result so far, though :( --- plugins/dfsound/xa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/dfsound/xa.c') diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 1241380..6c0ce4b 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -90,7 +90,9 @@ INLINE void MixXA(int ns_to, int decode_pos) static unsigned long timeGetTime_spu() { -#ifdef _WIN32 +#if defined(NO_OS) + return 0; +#elif defined(_WIN32) return GetTickCount(); #else struct timeval tv; -- cgit v1.2.3 From 3bd31caf9e9f5ddab2bf4fbdb5a129f4972c45f3 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 10 Jan 2015 01:55:24 +0200 Subject: spu: support multiple pending buffers for threaded implementation --- plugins/dfsound/xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/dfsound/xa.c') diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 6c0ce4b..ad7e824 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -38,7 +38,7 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0}; // MIX XA & CDDA //////////////////////////////////////////////////////////////////////// -INLINE void MixXA(int ns_to, int decode_pos) +INLINE void MixXA(int *SSumLR, int ns_to, int decode_pos) { int cursor = decode_pos; int ns; -- cgit v1.2.3