X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=d752acf2e291cc7fd2936e94e8826c18900f4073;hb=d0af6d75e0f944f31c8c88d053bf88b990fbcfb8;hp=dd05a5ab776bcd3d6f089e49fc8dcef71ba9d5c9;hpb=4b22d9501e7de7b7991e5cf3163e4b48806a0913;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index dd05a5ab..d752acf2 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -117,7 +117,7 @@ typedef struct
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)
  unsigned int      prevflags:3;                        // flags from previous block
  unsigned int      bIgnoreLoop:1;                      // Ignore loop
- unsigned int      bNewPitch:1;                        // pitch changed
+ unsigned int      bStarting:1;                        // starting after keyon
  union {
   struct {
    int             iLeftVolume;                        // left volume
@@ -182,7 +182,21 @@ typedef struct
 
 // psx buffers / addresses
 
-#define SB_SIZE (32 + 4)
+typedef union
+{
+ int SB[28 + 4 + 4];
+ struct {
+  int sample[28];
+  union {
+   struct {
+    int pos;
+    int val[4];
+   } gauss;
+   int simple[5]; // 28-32
+  } interp;
+  int sinc_old;
+ };
+} sample_buf;
 
 typedef struct
 {
@@ -190,13 +204,9 @@ typedef struct
  unsigned short  spuStat;
 
  unsigned int    spuAddr;
- union {
-  unsigned char  *spuMemC;
-  unsigned short *spuMem;
- };
- unsigned char * pSpuIrq;
 
  unsigned int    cycles_played;
+ unsigned int    cycles_dma_end;
  int             decode_pos;
  int             decode_dirty_ch;
  unsigned int    bSpuInit:1;
@@ -209,14 +219,33 @@ typedef struct
  unsigned int    dwChannelsAudible;    // not silent channels
  unsigned int    dwChannelDead;        // silent+not useful channels
 
+ unsigned int    XARepeat;
+ unsigned int    XALastVal;
+
+ int             iLeftXAVol;
+ int             iRightXAVol;
+
+ unsigned int    last_keyon_cycles;
+
+ union {
+  unsigned char  *spuMemC;
+  unsigned short *spuMem;
+ };
+ unsigned char * pSpuIrq;
+
  unsigned char * pSpuBuffer;
  short         * pS;
 
+ SPUCHAN       * s_chan;
+ REVERBInfo    * rvb;
+
+ int           * SSumLR;
+
  void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq
- void (CALLBACK *cddavCallback)(short, short);
+ //void (CALLBACK *cddavCallback)(short, short);
  void (CALLBACK *scheduleCallback)(unsigned int);
 
- xa_decode_t   * xapGlobal;
+ const xa_decode_t * xapGlobal;
  unsigned int  * XAFeed;
  unsigned int  * XAPlay;
  unsigned int  * XAStart;
@@ -227,21 +256,11 @@ typedef struct
  unsigned int  * CDDAStart;
  unsigned int  * CDDAEnd;
 
- unsigned int    XARepeat;
- unsigned int    XALastVal;
-
- int             iLeftXAVol;
- int             iRightXAVol;
-
- SPUCHAN       * s_chan;
- REVERBInfo    * rvb;
-
- // buffers
- int           * SB;
- int           * SSumLR;
-
- int             pad[29];
  unsigned short  regArea[0x400];
+
+ sample_buf      sb[MAXCHAN];
+ int             interpolation;
+ sample_buf      sb_thread[MAXCHAN];
 } SPUInfo;
 
 #define regAreaGet(offset) \
@@ -261,9 +280,9 @@ void do_samples(unsigned int cycles_to, int do_sync);
 void schedule_next_irq(void);
 void check_irq_io(unsigned int addr);
 
-#define do_samples_if_needed(c, sync) \
+#define do_samples_if_needed(c, sync, samples) \
  do { \
-  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
+  if (sync || (int)((c) - spu.cycles_played) >= (samples) * 768) \
    do_samples(c, sync); \
  } while (0)