spu: remove some hacks, to be reworked

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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index c69af81..bdf5956 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -35,12 +35,6 @@
 // spu defines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-// sound buffer sizes\r
-// 400 ms complete sound buffer\r
-#define SOUNDSIZE   70560\r
-// 137 ms test buffer... if less than that is buffered, a new upload will happen\r
-#define TESTSIZE    24192\r
-\r
 // num of channels\r
 #define MAXCHAN     24\r
 \r
@@ -107,19 +101,16 @@ 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
  ADSRInfoEx        ADSRX;\r
@@ -199,11 +190,13 @@ 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
 extern int        iXAPitch;\r
-extern int        iUseTimer;\r
 extern int        iSPUIRQWait;\r
 extern int        iDebugMode;\r
 extern int        iRecordMode;\r
@@ -221,12 +214,11 @@ extern unsigned short spuCtrl;
 extern unsigned short spuStat;\r
 extern unsigned short spuIrq;\r
 extern unsigned long  spuAddr;\r
-extern int      bEndThread; \r
-extern int      bThreadEnded;\r
 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