X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=3dea188cb79c0c5c69d6e161b13046b8c2bba8da;hb=43614ebdf8232541c602f1befc519a006296ede1;hp=c038ea3124a61098018f5ac94297f73e3b2a1ac3;hpb=5e719deac77b5c90eec87ea147b2bdbc30c53153;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index c038ea31..3dea188c 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -197,14 +197,14 @@ typedef struct
  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;
@@ -235,7 +235,9 @@ typedef struct
  unsigned short  regArea[0x400];
 } SPUInfo;
 
-#define regAreaGet(ch,offset) \
+#define regAreaGet(offset) \
+  spu.regArea[((offset) - 0xc00)>>1]
+#define regAreaGetCh(ch, offset) \
   spu.regArea[((ch<<4)|(offset))>>1]
 
 ///////////////////////////////////////////////////////////