spu: handle loop write vs loop flag race (bIgnoreLoop alternative)

[pcsx_rearmed.git] / plugins / dfsound / externals.h

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 90e26ce..c9f20ca 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -45,7 +45,9 @@
 #define MAXCHAN     24\r
 \r
 // ~ 1 ms of data\r
-#define NSSIZE 45\r
+// note: must be even due to the way reverb works now\r
+#define FRAG_MSECS 2\r
+#define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1)\r
 \r
 ///////////////////////////////////////////////////////////\r
 // struct defines\r
@@ -105,32 +107,22 @@ typedef struct
  int               spos;\r
  int               sinc;\r
 \r
- unsigned char *   pStart;                             // start ptr into sound mem\r
  unsigned char *   pCurr;                              // current pos in sound mem\r
  unsigned char *   pLoop;                              // loop ptr in sound mem\r
 \r
  unsigned int      bStop:1;                            // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
  unsigned int      bReverb:1;                          // can we do reverb on this channel? must have ctrl register bit, to get active\r
- unsigned int      bIgnoreLoop:1;                      // ignore loop bit, if an external loop address is used\r
  unsigned int      bRVBActive:1;                       // reverb active flag\r
  unsigned int      bNoise:1;                           // noise active flag\r
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)\r
+ unsigned int      bJump:1;                            // last decoded block jumped\r
 \r
- int               iActFreq;                           // current psx pitch\r
- int               iUsedFreq;                          // current pc pitch\r
  int               iLeftVolume;                        // left volume\r
  int               iRightVolume;                       // right volume\r
- int               s_1;                                // last decoding infos\r
- int               s_2;\r
  ADSRInfoEx        ADSRX;\r
  int               iRawPitch;                          // raw pitch (0...3fff)\r
 \r
- int               iRVBOffset;                         // reverb offset\r
- int               iRVBRepeat;                         // reverb repeat\r
- int               iRVBNum;                            // another reverb helper\r
- int               iOldNoise;                          // old noise val for this channel   \r
-\r
- int               SB[32+32];\r
+ int               SB[32+4];\r
 } SPUCHAN;\r
 \r
 ///////////////////////////////////////////////////////////\r
@@ -142,8 +134,6 @@ typedef struct
 \r
  int VolLeft;\r
  int VolRight;\r
- int iLastRVBLeft;\r
- int iLastRVBRight;\r
  int iRVBLeft;\r
  int iRVBRight;\r
 \r
@@ -179,6 +169,17 @@ typedef struct
  int MIX_DEST_B1;    // (offset)\r
  int IN_COEF_L;      // (coef.)\r
  int IN_COEF_R;      // (coef.)\r
+\r
+ int dirty;          // registers changed\r
+\r
+ // normalized offsets\r
+ int nIIR_DEST_A0, nIIR_DEST_A1, nIIR_DEST_B0, nIIR_DEST_B1,\r
+       nACC_SRC_A0, nACC_SRC_A1, nACC_SRC_B0, nACC_SRC_B1, \r
+       nIIR_SRC_A0, nIIR_SRC_A1, nIIR_SRC_B0, nIIR_SRC_B1,\r
+       nACC_SRC_C0, nACC_SRC_C1, nACC_SRC_D0, nACC_SRC_D1,\r
+       nMIX_DEST_A0, nMIX_DEST_A1, nMIX_DEST_B0, nMIX_DEST_B1;\r
+ // MIX_DEST_xx - FB_SRC_x\r
+ int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
 } REVERBInfo;\r
 \r
 ///////////////////////////////////////////////////////////\r
@@ -195,6 +196,9 @@ extern unsigned char * spuMemC;
 extern unsigned char * pSpuIrq;\r
 extern unsigned char * pSpuBuffer;\r
 \r
+#define regAreaGet(ch,offset) \\r
+  regArea[((ch<<4)|(offset))>>1]\r
+\r
 // user settings\r
 \r
 extern int        iVolume;\r
@@ -222,6 +226,8 @@ extern int      bThreadEnded;
 extern int      bSpuInit;\r
 extern unsigned int dwNewChannel;\r
 extern unsigned int dwChannelOn;\r
+extern unsigned int dwPendingChanOff;\r
+extern unsigned int dwChannelDead;\r
 \r
 extern int      SSumR[];\r
 extern int      SSumL[];\r
@@ -267,8 +273,5 @@ extern int           iRightXAVol;
 extern int *          sRVBPlay;\r
 extern int *          sRVBEnd;\r
 extern int *          sRVBStart;\r
-extern int            iReverbOff;\r
-extern int            iReverbRepeat;\r
-extern int            iReverbNum;    \r
 \r
 #endif\r