spu: get rid of iSpuAsyncWait hack

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

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 2493a1e..1a51cd7 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -173,10 +173,13 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
      //------------------------------------------------//\r
      case 14:                                          // loop?\r
        s_chan[ch].pLoop=spuMemC+((val&~1)<<3);\r
+       if(s_chan[ch].bJump)\r
+        // real machine would be most likely still doing the last block and use new value for the jump;\r
+        // but we decode ahead a bit and already did the jump part, so compensate for that now.\r
+        s_chan[ch].pCurr=s_chan[ch].pLoop;\r
        break;\r
      //------------------------------------------------//\r
     }\r
-   iSpuAsyncWait=0;\r
    return;\r
   }\r
 \r
@@ -343,8 +346,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
 \r
  if ((r & ~0x3f) == H_Reverb)\r
   rvb.dirty = 1; // recalculate on next update\r
-\r
- iSpuAsyncWait=0;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -355,8 +356,6 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
 {\r
  const unsigned long r=reg&0xfff;\r
         \r
- iSpuAsyncWait=0;\r
-\r
  if(r>=0x0c00 && r<0x0d80)\r
   {\r
    switch(r&0x0f)\r
@@ -429,6 +428,7 @@ static void SoundOn(int start,int end,unsigned short val)
      s_chan[ch].bStop=0;\r
      s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
      s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
+     s_chan[ch].bJump=0;\r
 \r
      dwNewChannel|=(1<<ch);                            // bitfield for faster testing\r
      dwChannelOn|=1<<ch;\r