frontend: do all bpp handling in plugin_lib

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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 3cb388c..2f3028e 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -21,6 +21,14 @@
 // generic defines\r
 /////////////////////////////////////////////////////////\r
 \r
+#ifdef __GNUC__\r
+#define noinline __attribute__((noinline))\r
+#define unlikely(x) __builtin_expect((x), 0)\r
+#else\r
+#define noinline\r
+#define unlikely(x) x\r
+#endif\r
+\r
 #define PSE_LT_SPU                  4\r
 #define PSE_SPU_ERR_SUCCESS         0\r
 #define PSE_SPU_ERR                 -60\r
@@ -48,24 +56,6 @@
 ///////////////////////////////////////////////////////////\r
 \r
 // ADSR INFOS PER CHANNEL\r
-typedef struct\r
-{\r
- int            AttackModeExp;\r
- long           AttackTime;\r
- long           DecayTime;\r
- long           SustainLevel;\r
- int            SustainModeExp;\r
- long           SustainModeDec;\r
- long           SustainTime;\r
- int            ReleaseModeExp;\r
- unsigned long  ReleaseVal;\r
- long           ReleaseTime;\r
- long           ReleaseStartTime; \r
- long           ReleaseVol; \r
- long           lTime;\r
- long           lVolume;\r
-} ADSRInfo;\r
-\r
 typedef struct\r
 {\r
  unsigned char  State:2;\r
@@ -202,15 +192,15 @@ extern int        iUseInterpolation;
 // MISC\r
 \r
 extern int had_dma;\r
+extern int decode_pos;\r
 \r
 extern SPUCHAN s_chan[];\r
 extern REVERBInfo rvb;\r
 \r
-extern unsigned long dwNoiseVal;\r
 extern unsigned short spuCtrl;\r
 extern unsigned short spuStat;\r
 extern unsigned short spuIrq;\r
-extern unsigned long  spuAddr;\r
+extern unsigned int   spuAddr;\r
 extern int      bSpuInit;\r
 extern unsigned int dwNewChannel;\r
 extern unsigned int dwChannelOn;\r
@@ -239,9 +229,6 @@ extern uint32_t * XAPlay;
 extern uint32_t * XAStart;\r
 extern uint32_t * XAEnd;\r
 \r
-extern uint32_t   XARepeat;\r
-extern uint32_t   XALastVal;\r
-\r
 extern uint32_t * CDDAFeed;\r
 extern uint32_t * CDDAPlay;\r
 extern uint32_t * CDDAStart;\r