apply cdrom volume in spu

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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 4e1a40b..e85c191 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
@@ -190,7 +179,7 @@ typedef union
   union {\r
    struct {\r
     int pos;\r
-    signed short val[4];\r
+    int val[4];\r
    } gauss;\r
    int simple[5]; // 28-32\r
   } interp;\r
@@ -225,6 +214,12 @@ 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
   unsigned char  *spuMemC;\r
   unsigned short *spuMem;\r
@@ -239,7 +234,7 @@ typedef struct
 \r
  int           * SSumLR;\r
 \r
- void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq\r
+ void (CALLBACK *irqCallback)(int);\r
  //void (CALLBACK *cddavCallback)(short, short);\r
  void (CALLBACK *scheduleCallback)(unsigned int);\r
 \r
@@ -277,6 +272,7 @@ extern SPUInfo spu;
 void do_samples(unsigned int cycles_to, int do_sync);\r
 void schedule_next_irq(void);\r
 void check_irq_io(unsigned int addr);\r
+void do_irq_io(int cycles_after);\r
 \r
 #define do_samples_if_needed(c, sync, samples) \\r
  do { \\r
@@ -286,4 +282,7 @@ void check_irq_io(unsigned int addr);
 \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