X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=5ec941525c234a4963471cee79f11853ac1c2092;hp=f6fc4409d3f3fb50a8e9451b03a90263d4efdb3a;hb=337887986422262fb88611d0b6cfcd79936e11c8;hpb=05c7cec77522f04857f655474574469a5e66661d

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index f6fc4409..5ec94152 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -110,7 +110,7 @@ typedef struct
  unsigned int      bNoise:1;                           // noise active flag
  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
  int               iLeftVolume;                        // left volume
  int               iRightVolume;                       // right volume
  ADSRInfoEx        ADSRX;
@@ -162,14 +162,8 @@ typedef struct
 
  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;
+ int FB_SRC_A0, FB_SRC_A1, FB_SRC_B0, FB_SRC_B1;
 } REVERBInfo;
 
 ///////////////////////////////////////////////////////////
@@ -195,6 +189,7 @@ typedef struct
  int             decode_dirty_ch;
  unsigned int    bSpuInit:1;
  unsigned int    bSPUIsOpen:1;
+ unsigned int    bMemDirty:1;          // had external write to SPU RAM
 
  unsigned int    dwNoiseVal;           // global noise generator
  unsigned int    dwNoiseCount;
@@ -206,7 +201,7 @@ typedef struct
  short         * pS;
 
  void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq
- void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ void (CALLBACK *cddavCallback)(short, short);
  void (CALLBACK *scheduleCallback)(unsigned int);
 
  xa_decode_t   * xapGlobal;
@@ -237,6 +232,9 @@ typedef struct
  unsigned short  regArea[0x400];
 } SPUInfo;
 
+#define regAreaGet(ch,offset) \
+  spu.regArea[((ch<<4)|(offset))>>1]
+
 ///////////////////////////////////////////////////////////
 // SPU.C globals
 ///////////////////////////////////////////////////////////
@@ -248,9 +246,6 @@ extern SPUInfo spu;
 void do_samples(unsigned int cycles_to, int do_sync);
 void schedule_next_irq(void);
 
-#define regAreaGet(ch,offset) \
-  spu.regArea[((ch<<4)|(offset))>>1]
-
 #define do_samples_if_needed(c, sync) \
  do { \
   if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \