X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=0ddf40672541648c94d35210d210f5051e5b9653;hp=73134d07a20a23fb35b47323524eb50ced7436fd;hb=77d6fd631e4c4efc26333ae43888855b9961493e;hpb=1775933abd26d2e282c4e0b4093778d204a0038d diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 73134d07..0ddf4067 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -46,7 +46,8 @@ // ~ 1 ms of data // note: must be even due to the way reverb works now -#define NSSIZE 46 +#define FRAG_MSECS 2 +#define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1) /////////////////////////////////////////////////////////// // struct defines @@ -121,17 +122,10 @@ typedef struct int iUsedFreq; // current pc pitch int iLeftVolume; // left volume int iRightVolume; // right volume - int s_1; // last decoding infos - int s_2; ADSRInfoEx ADSRX; int iRawPitch; // raw pitch (0...3fff) - int iRVBOffset; // reverb offset - int iRVBRepeat; // reverb repeat - int iRVBNum; // another reverb helper - int iOldNoise; // old noise val for this channel - - int SB[32+32]; + int SB[32+4]; } SPUCHAN; /////////////////////////////////////////////////////////// @@ -205,6 +199,9 @@ extern unsigned char * spuMemC; extern unsigned char * pSpuIrq; extern unsigned char * pSpuBuffer; +#define regAreaGet(ch,offset) \ + regArea[((ch<<4)|(offset))>>1] + // user settings extern int iVolume; @@ -233,6 +230,7 @@ extern int bSpuInit; extern unsigned int dwNewChannel; extern unsigned int dwChannelOn; extern unsigned int dwPendingChanOff; +extern unsigned int dwChannelDead; extern int SSumR[]; extern int SSumL[];