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 e85c191..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
@@ -214,6 +214,7 @@ typedef struct
  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
@@ -253,13 +254,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
@@ -269,15 +274,15 @@ 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, samples) \\r
+#define do_samples_if_needed(c, no_thread, samples) \\r
  do { \\r
-  if (sync || (int)((c) - spu.cycles_played) >= (samples) * 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