cdrom: change pause timing again

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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index f638b94..6dbbac6 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -58,7 +58,7 @@
 #define MAXCHAN     24\r
 \r
 // note: must be even due to the way reverb works now\r
-#define NSSIZE ((44100 / 50 + 16) & ~1)\r
+#define NSSIZE ((44100 / 50 + 32) & ~1)\r
 \r
 ///////////////////////////////////////////////////////////\r
 // struct defines\r
@@ -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
@@ -117,7 +106,7 @@ typedef struct
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)\r
  unsigned int      prevflags:3;                        // flags from previous block\r
  unsigned int      bIgnoreLoop:1;                      // Ignore loop\r
- unsigned int      bNewPitch:1;                        // pitch changed\r
+ unsigned int      bStarting:1;                        // starting after keyon\r
  union {\r
   struct {\r
    int             iLeftVolume;                        // left volume\r
@@ -182,7 +171,21 @@ typedef struct
 \r
 // psx buffers / addresses\r
 \r
-#define SB_SIZE (32 + 4)\r
+typedef union\r
+{\r
+ int SB[28 + 4 + 4];\r
+ struct {\r
+  int sample[28];\r
+  union {\r
+   struct {\r
+    int pos;\r
+    int val[4];\r
+   } gauss;\r
+   int simple[5]; // 28-32\r
+  } interp;\r
+  int sinc_old;\r
+ };\r
+} sample_buf;\r
 \r
 typedef struct\r
 {\r
@@ -190,11 +193,6 @@ typedef struct
  unsigned short  spuStat;\r
 \r
  unsigned int    spuAddr;\r
- union {\r
-  unsigned char  *spuMemC;\r
-  unsigned short *spuMem;\r
- };\r
- unsigned char * pSpuIrq;\r
 \r
  unsigned int    cycles_played;\r
  unsigned int    cycles_dma_end;\r
@@ -210,14 +208,38 @@ typedef struct
  unsigned int    dwChannelsAudible;    // not silent channels\r
  unsigned int    dwChannelDead;        // silent+not useful channels\r
 \r
+ unsigned int    XARepeat;\r
+ unsigned int    XALastVal;\r
+\r
+ int             iLeftXAVol;\r
+ int             iRightXAVol;\r
+\r
+ int             cdClearSamples;       // extra samples to clear the capture buffers\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
+ };\r
+ unsigned char * pSpuIrq;\r
+\r
  unsigned char * pSpuBuffer;\r
  short         * pS;\r
 \r
- void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq\r
- void (CALLBACK *cddavCallback)(short, short);\r
+ SPUCHAN       * s_chan;\r
+ REVERBInfo    * rvb;\r
+\r
+ int           * SSumLR;\r
+\r
+ void (CALLBACK *irqCallback)(int);\r
+ //void (CALLBACK *cddavCallback)(short, short);\r
  void (CALLBACK *scheduleCallback)(unsigned int);\r
 \r
- xa_decode_t   * xapGlobal;\r
+ const xa_decode_t * xapGlobal;\r
  unsigned int  * XAFeed;\r
  unsigned int  * XAPlay;\r
  unsigned int  * XAStart;\r
@@ -228,26 +250,21 @@ typedef struct
  unsigned int  * CDDAStart;\r
  unsigned int  * CDDAEnd;\r
 \r
- unsigned int    XARepeat;\r
- unsigned int    XALastVal;\r
-\r
- int             iLeftXAVol;\r
- int             iRightXAVol;\r
-\r
- SPUCHAN       * s_chan;\r
- REVERBInfo    * rvb;\r
+ unsigned short  regArea[0x400];\r
 \r
- // buffers\r
- int           * SB;\r
- int           * SSumLR;\r
+ sample_buf      sb[MAXCHAN];\r
+ int             interpolation;\r
 \r
- unsigned short  regArea[0x400];\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
@@ -257,16 +274,20 @@ typedef struct
 \r
 extern SPUInfo spu;\r
 \r
-void do_samples(unsigned int cycles_to, int do_sync);\r
+void do_samples(unsigned int cycles_to, int force_no_thread);\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) \\r
+#define do_samples_if_needed(c, no_thread, samples) \\r
  do { \\r
-  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
-   do_samples(c, sync); \\r
+  if ((no_thread) || (int)((c) - spu.cycles_played) >= (samples) * 768) \\r
+   do_samples(c, no_thread); \\r
  } while (0)\r
 \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