From 1d753163fcfe8f75fad07c413ebbdb8cfe448f8b Mon Sep 17 00:00:00 2001
From: notaz
Date: Wed, 2 Jan 2013 00:33:53 +0200
Subject: spu: fix decode buffers

sync is still broken :(
---
 plugins/dfsound/xa.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 1c5425e..e58bca2 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -78,8 +78,9 @@ INLINE void MixXA(void)
     r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
     SSumLR[ns++] += l;
     SSumLR[ns++] += r;
-    spuMem[cursor] = l;
-    spuMem[cursor + 0x400/2] = r;
+
+    spuMem[cursor] = v;
+    spuMem[cursor + 0x400/2] = v >> 16;
     cursor = (cursor + 1) & 0x1ff;
    }
   XALastVal = v;
@@ -94,8 +95,9 @@ INLINE void MixXA(void)
    r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
    SSumLR[ns++] += l;
    SSumLR[ns++] += r;
-   spuMem[cursor] = l;
-   spuMem[cursor + 0x400/2] = r;
+
+   spuMem[cursor] = v;
+   spuMem[cursor + 0x400/2] = v >> 16;
    cursor = (cursor + 1) & 0x1ff;
   }
 }
-- 
cgit v1.2.3


From 7ba3e79c025dfd41ba88bcbe7b330a1a7fd68551 Mon Sep 17 00:00:00 2001
From: notaz
Date: Thu, 3 Jan 2013 02:00:44 +0200
Subject: spu: also return on decoder irqs

---
 plugins/dfsound/spu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 2466569..9f91b8b 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -689,7 +689,7 @@ static int do_samples(int forced_updates)
  int ch,d,silentch;
  int bIRQReturn=0;
 
- while(1)
+ while(!bIRQReturn)
   {
    // ok, at the beginning we are looking if there is
    // enuff free place in the dsound/oss buffer to
@@ -863,6 +863,7 @@ static int do_samples(int forced_updates)
      {
       //printf("decoder irq %x\n", decode_pos);
       do_irq();
+      bIRQReturn = 1;
      }
    }
   decode_pos = (decode_pos + NSSIZE) & 0x1ff;
-- 
cgit v1.2.3