standalone: revive spu_c64x build

[pcsx_rearmed.git] / plugins / dfsound / externals.h

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index fef5f9c..2b593ec 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -89,17 +89,6 @@ typedef struct
               \r
 ///////////////////////////////////////////////////////////\r
 \r
-// Tmp Flags\r
-\r
-// used for debug channel muting\r
-#define FLAG_MUTE  1\r
-\r
-// used for simple interpolation\r
-#define FLAG_IPOL0 2\r
-#define FLAG_IPOL1 4\r
-\r
-///////////////////////////////////////////////////////////\r
-\r
 // MAIN CHANNEL STRUCT\r
 typedef struct\r
 {\r
@@ -225,6 +214,10 @@ typedef struct
  int             iLeftXAVol;\r
  int             iRightXAVol;\r
 \r
+ struct {                              // channel volume in the cd controller\r
+  unsigned char  ll, lr, rl, rr;       // see cdr.Attenuator* in cdrom.c\r
+ } cdv;                                // applied on spu side for easier emulation\r
+\r
  unsigned int    last_keyon_cycles;\r
 \r
  union {\r
@@ -260,13 +253,17 @@ typedef struct
 \r
  sample_buf      sb[MAXCHAN];\r
  int             interpolation;\r
- sample_buf      sb_thread[MAXCHAN];\r
+\r
+#if P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)\r
+ sample_buf    * sb_thread;\r
+ sample_buf      sb_thread_[MAXCHAN];\r
+#endif\r
 } SPUInfo;\r
 \r
 #define regAreaGet(offset) \\r
-  spu.regArea[((offset) - 0xc00)>>1]\r
+  spu.regArea[((offset) - 0xc00) >> 1]\r
 #define regAreaGetCh(ch, offset) \\r
-  spu.regArea[((ch<<4)|(offset))>>1]\r
+  spu.regArea[(((ch) << 4) | (offset)) >> 1]\r
 \r
 ///////////////////////////////////////////////////////////\r
 // SPU.C globals\r
@@ -289,4 +286,7 @@ void do_irq_io(int cycles_after);
 \r
 #endif\r
 \r
+void FeedXA(const xa_decode_t *xap);\r
+void FeedCDDA(unsigned char *pcm, int nBytes);\r
+\r
 #endif /* __P_SOUND_EXTERNALS_H__ */\r