X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=5157412182c2a4a2db126b4b8661f693a159a27a;hb=8987ee208f057b59a35815f4e6a805935faf2fc8;hp=8bbf4e0208e37ef764f38ebd27787e8161464eac;hpb=7b2c4897f089ab6eee7bc2ce2873c2b11058e04e;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 8bbf4e02..51574121 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -15,12 +15,18 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef __P_SOUND_EXTERNALS_H__
+#define __P_SOUND_EXTERNALS_H__
+
 #include <stdint.h>
 
 /////////////////////////////////////////////////////////
 // generic defines
 /////////////////////////////////////////////////////////
 
+//#define log_unhandled printf
+#define log_unhandled(...)
+
 #ifdef __GNUC__
 #define noinline __attribute__((noinline))
 #define unlikely(x) __builtin_expect((x), 0)
@@ -110,7 +116,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;
@@ -189,18 +195,19 @@ 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;
  unsigned int    dwNewChannel;         // flags for faster testing, if new channel starts
- unsigned int    dwChannelOn;          // not silent channels
+ unsigned int    dwChannelsAudible;    // not silent channels
  unsigned int    dwChannelDead;        // silent+not useful channels
 
  unsigned char * pSpuBuffer;
  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;
@@ -231,6 +238,11 @@ typedef struct
  unsigned short  regArea[0x400];
 } SPUInfo;
 
+#define regAreaGet(offset) \
+  spu.regArea[((offset) - 0xc00)>>1]
+#define regAreaGetCh(ch, offset) \
+  spu.regArea[((ch<<4)|(offset))>>1]
+
 ///////////////////////////////////////////////////////////
 // SPU.C globals
 ///////////////////////////////////////////////////////////
@@ -242,9 +254,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) \
@@ -253,3 +262,4 @@ void schedule_next_irq(void);
 
 #endif
 
+#endif /* __P_SOUND_EXTERNALS_H__ */