X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=73134d07a20a23fb35b47323524eb50ced7436fd;hp=f85620460acac2fd2ca56f6c8cbd364bef85ea91;hb=1775933abd26d2e282c4e0b4093778d204a0038d;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index f8562046..73134d07 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -45,7 +45,8 @@
 #define MAXCHAN     24
 
 // ~ 1 ms of data
-#define NSSIZE 45
+// note: must be even due to the way reverb works now
+#define NSSIZE 46
 
 ///////////////////////////////////////////////////////////
 // struct defines
@@ -72,20 +73,17 @@ typedef struct
 
 typedef struct
 {
- int            State;
- int            AttackModeExp;
- int            AttackRate;
- int            DecayRate;
- int            SustainLevel;
- int            SustainModeExp;
- int            SustainIncrease;
- int            SustainRate;
- int            ReleaseModeExp;
- int            ReleaseRate;
+ unsigned char  State:2;
+ unsigned char  AttackModeExp:1;
+ unsigned char  SustainModeExp:1;
+ unsigned char  SustainIncrease:1;
+ unsigned char  ReleaseModeExp:1;
+ unsigned char  AttackRate;
+ unsigned char  DecayRate;
+ unsigned char  SustainLevel;
+ unsigned char  SustainRate;
+ unsigned char  ReleaseRate;
  int            EnvelopeVol;
- long           lVolume;
- long           lDummy1;
- long           lDummy2;
 } ADSRInfoEx;
               
 ///////////////////////////////////////////////////////////
@@ -104,45 +102,36 @@ typedef struct
 // MAIN CHANNEL STRUCT
 typedef struct
 {
- // no mutexes used anymore... don't need them to sync access
- //HANDLE            hMutex;
-
- int               bNew;                               // start flag
-
  int               iSBPos;                             // mixing stuff
  int               spos;
  int               sinc;
- int               SB[32+32];                          // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)
- int               sval;
 
  unsigned char *   pStart;                             // start ptr into sound mem
  unsigned char *   pCurr;                              // current pos in sound mem
  unsigned char *   pLoop;                              // loop ptr in sound mem
 
- int               bOn;                                // is channel active (sample playing?)
- int               bStop;                              // is channel stopped (sample _can_ still be playing, ADSR Release phase)
- int               bReverb;                            // can we do reverb on this channel? must have ctrl register bit, to get active
+ 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)
+
  int               iActFreq;                           // current psx pitch
  int               iUsedFreq;                          // current pc pitch
  int               iLeftVolume;                        // left volume
- int               iLeftVolRaw;                        // left psx volume value
- int               bIgnoreLoop;                        // ignore loop bit, if an external loop address is used
- int               iMute;                              // mute mode
  int               iRightVolume;                       // right volume
- int               iRightVolRaw;                       // right psx volume value
- int               iRawPitch;                          // raw pitch (0...3fff)
- int               iIrqDone;                           // debug irq done flag
  int               s_1;                                // last decoding infos
  int               s_2;
- int               bRVBActive;                         // reverb active flag
+ ADSRInfoEx        ADSRX;
+ int               iRawPitch;                          // raw pitch (0...3fff)
+
  int               iRVBOffset;                         // reverb offset
  int               iRVBRepeat;                         // reverb repeat
- int               bNoise;                             // noise active flag
- int               bFMod;                              // freq mod (0=off, 1=sound channel, 2=freq channel)
  int               iRVBNum;                            // another reverb helper
  int               iOldNoise;                          // old noise val for this channel   
- ADSRInfo          ADSR;                               // active ADSR settings
- ADSRInfoEx        ADSRX;                              // next ADSR settings (will be moved to active on sample start)
+
+ int               SB[32+32];
 } SPUCHAN;
 
 ///////////////////////////////////////////////////////////
@@ -154,8 +143,6 @@ typedef struct
 
  int VolLeft;
  int VolRight;
- int iLastRVBLeft;
- int iLastRVBRight;
  int iRVBLeft;
  int iRVBRight;
 
@@ -191,6 +178,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;
 
 ///////////////////////////////////////////////////////////
@@ -217,7 +215,6 @@ extern int        iDebugMode;
 extern int        iRecordMode;
 extern int        iUseReverb;
 extern int        iUseInterpolation;
-extern int        iDisStereo;
 // MISC
 
 extern int iSpuAsyncWait;
@@ -233,7 +230,9 @@ extern unsigned long  spuAddr;
 extern int      bEndThread; 
 extern int      bThreadEnded;
 extern int      bSpuInit;
-extern unsigned long dwNewChannel;
+extern unsigned int dwNewChannel;
+extern unsigned int dwChannelOn;
+extern unsigned int dwPendingChanOff;
 
 extern int      SSumR[];
 extern int      SSumL[];
@@ -279,8 +278,5 @@ extern int           iRightXAVol;
 extern int *          sRVBPlay;
 extern int *          sRVBEnd;
 extern int *          sRVBStart;
-extern int            iReverbOff;
-extern int            iReverbRepeat;
-extern int            iReverbNum;    
 
 #endif