spu: support multiple pending buffers

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

diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index b7bcf12..7e32b8e 100644 (file)
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -39,15 +39,6 @@ INLINE void StartREVERB(int ch)
  else spu.s_chan[ch].bRVBActive=0;                     // else -> no reverb\r
 }\r
 \r
-////////////////////////////////////////////////////////////////////////\r
-// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-INLINE void InitREVERB(int ns_to)\r
-{\r
- memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);\r
-}\r
-\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 INLINE int rvb2ram_offs(int curr, int space, int iOff)\r
@@ -73,7 +64,7 @@ INLINE int rvb2ram_offs(int curr, int space, int iOff)
 ////////////////////////////////////////////////////////////////////////\r
 \r
 // portions based on spu2-x from PCSX2\r
-static void MixREVERB(int ns_to)\r
+static void MixREVERB(int *SSumLR, int *RVB, int ns_to)\r
 {\r
  int l_old = rvb.iRVBLeft;\r
  int r_old = rvb.iRVBRight;\r
@@ -87,8 +78,8 @@ static void MixREVERB(int ns_to)
    int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;\r
    int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;\r
 \r
-   int input_L = spu.sRVBStart[ns]   * rvb.IN_COEF_L;\r
-   int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;\r
+   int input_L = RVB[ns]   * rvb.IN_COEF_L;\r
+   int input_R = RVB[ns+1] * rvb.IN_COEF_R;\r
 \r
    int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;\r
    int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;\r
@@ -158,7 +149,7 @@ static void MixREVERB(int ns_to)
  rvb.CurrAddr = curr_addr;\r
 }\r
 \r
-static void MixREVERB_off(int ns_to)\r
+static void MixREVERB_off(int *SSumLR, int ns_to)\r
 {\r
  int l_old = rvb.iRVBLeft;\r
  int r_old = rvb.iRVBRight;\r
@@ -236,7 +227,7 @@ static void prepare_offsets(void)
  rvb.dirty = 0;\r
 }\r
 \r
-INLINE void REVERBDo(int ns_to)\r
+INLINE void REVERBDo(int *SSumLR, int *RVB, int ns_to)\r
 {\r
  if (!rvb.StartAddr)                                   // reverb is off\r
  {\r
@@ -249,14 +240,14 @@ INLINE void REVERBDo(int ns_to)
   if (unlikely(rvb.dirty))\r
    prepare_offsets();\r
 \r
-  MixREVERB(ns_to);\r
+  MixREVERB(SSumLR, RVB, ns_to);\r
  }\r
  else if (rvb.VolLeft || rvb.VolRight)\r
  {\r
   if (unlikely(rvb.dirty))\r
    prepare_offsets();\r
 \r
-  MixREVERB_off(ns_to);\r
+  MixREVERB_off(SSumLR, ns_to);\r
  }\r
  else                                                  // -> reverb off\r
  {\r