X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=3047afc81ed5a94b10b29ea6c87e7c250ae1d59c;hp=d1d081af744fecfd5eef463fab390c950431c818;hb=5514a050f4e936f5c333fa1271b11bf5a6a9ea39;hpb=9ad8abfa940cd5c13eb0653639ea86736b65a2c4

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index d1d081af..3047afc8 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -181,7 +181,10 @@ typedef struct
  unsigned short  spuStat;
 
  unsigned int    spuAddr;
- unsigned char * spuMemC;
+ union {
+  unsigned char  *spuMemC;
+  unsigned short *spuMem;
+ };
  unsigned char * pSpuIrq;
 
  unsigned int    cycles_played;
@@ -222,9 +225,10 @@ typedef struct
  int             iLeftXAVol;
  int             iRightXAVol;
 
- int             pad[32];
+ SPUCHAN       * s_chan;
+
+ int             pad[31];
  unsigned short  regArea[0x400];
- unsigned short  spuMem[256*1024];
 } SPUInfo;
 
 ///////////////////////////////////////////////////////////
@@ -234,19 +238,18 @@ typedef struct
 #ifndef _IN_SPU
 
 extern SPUInfo spu;
-extern SPUCHAN s_chan[];
 extern REVERBInfo rvb;
 
-void do_samples(unsigned int cycles_to);
+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) \
+#define do_samples_if_needed(c, sync) \
  do { \
-  if ((int)((c) - spu.cycles_played) >= 16 * 768) \
-   do_samples(c); \
+  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
+   do_samples(c, sync); \
  } while (0)
 
 #endif