notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: pandora: work around r20a vs r21 versioning
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
xa.c
diff --git
a/plugins/dfsound/xa.c
b/plugins/dfsound/xa.c
index
9b7ed5a
..
ad7e824
100644
(file)
--- 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
////////////////////////////////////////////////////////////////////////
// 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 ns;
short l, r;
uint32_t v;
- int cursor = spu.decode_pos;
if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0)
{
if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0)
{
@@
-90,7
+90,9
@@
INLINE void MixXA(int ns_to)
static unsigned long timeGetTime_spu()
{
static unsigned long timeGetTime_spu()
{
-#ifdef _WIN32
+#if defined(NO_OS)
+ return 0;
+#elif defined(_WIN32)
return GetTickCount();
#else
struct timeval tv;
return GetTickCount();
#else
struct timeval tv;