X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=28dab573c1c7a3b9d46a2f5291166e90788288ca;hp=dd582ffff79cfab6ae24b81abfc876e97add9c59;hb=fa56d36096cd4ab2b227ce2aa61c8404b8874689;hpb=fb552464f06137102fd9ca69a05492265bbdcea7 diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index dd582fff..28dab573 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -21,6 +21,14 @@ // generic defines ///////////////////////////////////////////////////////// +#ifdef __GNUC__ +#define noinline __attribute__((noinline)) +#define unlikely(x) __builtin_expect((x), 0) +#else +#define noinline +#define unlikely(x) x +#endif + #define PSE_LT_SPU 4 #define PSE_SPU_ERR_SUCCESS 0 #define PSE_SPU_ERR -60 @@ -109,7 +117,7 @@ typedef struct unsigned int bRVBActive:1; // reverb active flag unsigned int bNoise:1; // noise active flag unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel) - unsigned int bJump:1; // last decoded block jumped + unsigned int prevflags:3; // flags from previous block int iLeftVolume; // left volume int iRightVolume; // right volume @@ -197,14 +205,12 @@ extern unsigned char * pSpuBuffer; extern int iVolume; extern int iXAPitch; -extern int iSPUIRQWait; -extern int iDebugMode; -extern int iRecordMode; extern int iUseReverb; extern int iUseInterpolation; // MISC extern int had_dma; +extern int decode_pos; extern SPUCHAN s_chan[]; extern REVERBInfo rvb; @@ -242,9 +248,6 @@ extern uint32_t * XAPlay; extern uint32_t * XAStart; extern uint32_t * XAEnd; -extern uint32_t XARepeat; -extern uint32_t XALastVal; - extern uint32_t * CDDAFeed; extern uint32_t * CDDAPlay; extern uint32_t * CDDAStart;