spu: rework synchronization

[pcsx_rearmed.git] / plugins / dfsound / xa.c

diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index e58bca2..4c016aa 100644 (file)
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -56,7 +56,7 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 // MIX XA & CDDA
 ////////////////////////////////////////////////////////////////////////
 
 // MIX XA & CDDA
 ////////////////////////////////////////////////////////////////////////
 

-INLINE void MixXA(void)
+INLINE void MixXA(int ns_to)

 {
  int ns;
  short l, r;
 {
  int ns;
  short l, r;


@@ -69,7 +69,7 @@ INLINE void MixXA(void)
    XARepeat--;
 
   v = XALastVal;
    XARepeat--;
 
   v = XALastVal;

-  for(ns=0;ns<NSSIZE*2;)
+  for(ns = 0; ns < ns_to*2; )

    {
     if(XAPlay != XAFeed) v=*XAPlay++;
     if(XAPlay == XAEnd) XAPlay=XAStart;
    {
     if(XAPlay != XAFeed) v=*XAPlay++;
     if(XAPlay == XAEnd) XAPlay=XAStart;


@@ -86,7 +86,7 @@ INLINE void MixXA(void)
   XALastVal = v;
  }
 
   XALastVal = v;
  }
 

- for(ns=0;ns<NSSIZE*2 && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);)
+ for(ns = 0; ns < ns_to * 2 && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);)

   {
    v=*CDDAPlay++;
    if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
   {
    v=*CDDAPlay++;
    if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;