X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=c9f20ca8ec946438e523de895975d8ede4bac911;hp=2ccc811d46ba471d811abb7ad28c1ef71900fbdc;hb=be1cb678c445cb8d9a4d707c698f0dc600a490ea;hpb=3fc2a4c27be8c8cd5f8cf53a0d56c263275b8501

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