notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
spu: use last written loop value when starting
[pcsx_rearmed.git] / plugins / dfsound / registers.c
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index ac495d6..983af8c 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -22,7 +22,6 @@
 #include "externals.h"\r
 #include "registers.h"\r
 #include "regs.h"\r
-#include "reverb.h"\r
 \r
 /*\r
 // adsr time values (in ms) by James Higgs ... see the end of\r
@@ -170,6 +169,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
        s_chan[ch].pLoop=spuMemC+((unsigned long)((val<<3)&~0xf));\r
        //s_chan[ch].bIgnoreLoop=1;\r
        //ReleaseMutex(s_chan[ch].hMutex);                    // -> oki, on with the thread\r
+       dwChannelDead&=~(1<<ch);\r
        break;\r
      //------------------------------------------------//\r
     }\r
@@ -212,6 +212,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
           rvb.CurrAddr=rvb.StartAddr;\r
          }\r
        }\r
+      rvb.dirty = 1;\r
       break;\r
     //-------------------------------------------------//\r
     case H_SPUirqAddr:\r
@@ -303,19 +304,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
       ReverbOn(16,24,val);\r
       break;\r
     //-------------------------------------------------//\r
-    case H_Reverb+0:\r
-\r
-      rvb.FB_SRC_A=val;\r
-\r
-      // OK, here's the fake REVERB stuff...\r
-      // depending on effect we do more or less delay and repeats... bah\r
-      // still... better than nothing :)\r
-\r
-      SetREVERB(val);\r
-      break;\r
-\r
-\r
-    case H_Reverb+2   : rvb.FB_SRC_B=(short)val;       break;\r
+    case H_Reverb+0   : rvb.FB_SRC_A=val*4;            break;\r
+    case H_Reverb+2   : rvb.FB_SRC_B=val*4;            break;\r
     case H_Reverb+4   : rvb.IIR_ALPHA=(short)val;      break;\r
     case H_Reverb+6   : rvb.ACC_COEF_A=(short)val;     break;\r
     case H_Reverb+8   : rvb.ACC_COEF_B=(short)val;     break;\r
@@ -324,30 +314,33 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
     case H_Reverb+14  : rvb.IIR_COEF=(short)val;       break;\r
     case H_Reverb+16  : rvb.FB_ALPHA=(short)val;       break;\r
     case H_Reverb+18  : rvb.FB_X=(short)val;           break;\r
-    case H_Reverb+20  : rvb.IIR_DEST_A0=(short)val;    break;\r
-    case H_Reverb+22  : rvb.IIR_DEST_A1=(short)val;    break;\r
-    case H_Reverb+24  : rvb.ACC_SRC_A0=(short)val;     break;\r
-    case H_Reverb+26  : rvb.ACC_SRC_A1=(short)val;     break;\r
-    case H_Reverb+28  : rvb.ACC_SRC_B0=(short)val;     break;\r
-    case H_Reverb+30  : rvb.ACC_SRC_B1=(short)val;     break;\r
-    case H_Reverb+32  : rvb.IIR_SRC_A0=(short)val;     break;\r
-    case H_Reverb+34  : rvb.IIR_SRC_A1=(short)val;     break;\r
-    case H_Reverb+36  : rvb.IIR_DEST_B0=(short)val;    break;\r
-    case H_Reverb+38  : rvb.IIR_DEST_B1=(short)val;    break;\r
-    case H_Reverb+40  : rvb.ACC_SRC_C0=(short)val;     break;\r
-    case H_Reverb+42  : rvb.ACC_SRC_C1=(short)val;     break;\r
-    case H_Reverb+44  : rvb.ACC_SRC_D0=(short)val;     break;\r
-    case H_Reverb+46  : rvb.ACC_SRC_D1=(short)val;     break;\r
-    case H_Reverb+48  : rvb.IIR_SRC_B1=(short)val;     break;\r
-    case H_Reverb+50  : rvb.IIR_SRC_B0=(short)val;     break;\r
-    case H_Reverb+52  : rvb.MIX_DEST_A0=(short)val;    break;\r
-    case H_Reverb+54  : rvb.MIX_DEST_A1=(short)val;    break;\r
-    case H_Reverb+56  : rvb.MIX_DEST_B0=(short)val;    break;\r
-    case H_Reverb+58  : rvb.MIX_DEST_B1=(short)val;    break;\r
+    case H_Reverb+20  : rvb.IIR_DEST_A0=val*4;         break;\r
+    case H_Reverb+22  : rvb.IIR_DEST_A1=val*4;         break;\r
+    case H_Reverb+24  : rvb.ACC_SRC_A0=val*4;          break;\r
+    case H_Reverb+26  : rvb.ACC_SRC_A1=val*4;          break;\r
+    case H_Reverb+28  : rvb.ACC_SRC_B0=val*4;          break;\r
+    case H_Reverb+30  : rvb.ACC_SRC_B1=val*4;          break;\r
+    case H_Reverb+32  : rvb.IIR_SRC_A0=val*4;          break;\r
+    case H_Reverb+34  : rvb.IIR_SRC_A1=val*4;          break;\r
+    case H_Reverb+36  : rvb.IIR_DEST_B0=val*4;         break;\r
+    case H_Reverb+38  : rvb.IIR_DEST_B1=val*4;         break;\r
+    case H_Reverb+40  : rvb.ACC_SRC_C0=val*4;          break;\r
+    case H_Reverb+42  : rvb.ACC_SRC_C1=val*4;          break;\r
+    case H_Reverb+44  : rvb.ACC_SRC_D0=val*4;          break;\r
+    case H_Reverb+46  : rvb.ACC_SRC_D1=val*4;          break;\r
+    case H_Reverb+48  : rvb.IIR_SRC_B1=val*4;          break;\r
+    case H_Reverb+50  : rvb.IIR_SRC_B0=val*4;          break;\r
+    case H_Reverb+52  : rvb.MIX_DEST_A0=val*4;         break;\r
+    case H_Reverb+54  : rvb.MIX_DEST_A1=val*4;         break;\r
+    case H_Reverb+56  : rvb.MIX_DEST_B0=val*4;         break;\r
+    case H_Reverb+58  : rvb.MIX_DEST_B1=val*4;         break;\r
     case H_Reverb+60  : rvb.IN_COEF_L=(short)val;      break;\r
     case H_Reverb+62  : rvb.IN_COEF_R=(short)val;      break;\r
    }\r
 \r
+ if ((r & ~0x3f) == H_Reverb)\r
+  rvb.dirty = 1; // recalculate on next update\r
+\r
  iSpuAsyncWait=0;\r
 }\r
 \r
@@ -426,17 +419,19 @@ void SoundOn(int start,int end,unsigned short val)     // SOUND ON PSX COMAND
 \r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   if((val&1) && s_chan[ch].pStart)                    // mmm... start has to be set before key on !?!\r
+   if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!\r
     {\r
      s_chan[ch].bIgnoreLoop=0;\r
 \r
      // do this here, not in StartSound\r
      // - fixes fussy timing issues\r
      s_chan[ch].bStop=0;\r
-     s_chan[ch].pCurr=s_chan[ch].pStart;\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
 \r
      dwNewChannel|=(1<<ch);                            // bitfield for faster testing\r
      dwChannelOn|=1<<ch;\r
+     dwChannelDead&=~(1<<ch);\r
     }\r
   }\r
 }\r
@@ -482,6 +477,8 @@ void FModOn(int start,int end,unsigned short val)      // FMOD ON PSX COMMAND
    else\r
     {\r
      s_chan[ch].bFMod=0;                               // --> turn off fmod\r
+     if(ch>0&&s_chan[ch-1].bFMod==2)\r
+      s_chan[ch-1].bFMod=0;\r
     }\r
   }\r
 }\r
ARM optimized PCSX fork