X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=0146553a324c74acafb0459cbbdcfe8631858524;hp=0ddf40672541648c94d35210d210f5051e5b9653;hb=f2aec10aa8e3befe7e89070e8559d070835cc23e;hpb=77d6fd631e4c4efc26333ae43888855b9961493e diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 0ddf4067..0146553a 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -35,16 +35,10 @@ // spu defines //////////////////////////////////////////////////////////////////////// -// sound buffer sizes -// 400 ms complete sound buffer -#define SOUNDSIZE 70560 -// 137 ms test buffer... if less than that is buffered, a new upload will happen -#define TESTSIZE 24192 - // num of channels #define MAXCHAN 24 -// ~ 1 ms of data +// ~ FRAG_MSECS ms of data // note: must be even due to the way reverb works now #define FRAG_MSECS 2 #define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1) @@ -107,19 +101,16 @@ typedef struct int spos; int sinc; - unsigned char * pStart; // start ptr into sound mem unsigned char * pCurr; // current pos in sound mem unsigned char * pLoop; // loop ptr in sound mem unsigned int bStop:1; // is channel stopped (sample _can_ still be playing, ADSR Release phase) unsigned int bReverb:1; // can we do reverb on this channel? must have ctrl register bit, to get active - unsigned int bIgnoreLoop:1; // ignore loop bit, if an external loop address is used 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 - int iActFreq; // current psx pitch - int iUsedFreq; // current pc pitch int iLeftVolume; // left volume int iRightVolume; // right volume ADSRInfoEx ADSRX; @@ -206,15 +197,11 @@ extern unsigned char * pSpuBuffer; extern int iVolume; extern int iXAPitch; -extern int iUseTimer; -extern int iSPUIRQWait; -extern int iDebugMode; -extern int iRecordMode; extern int iUseReverb; extern int iUseInterpolation; // MISC -extern int iSpuAsyncWait; +extern int had_dma; extern SPUCHAN s_chan[]; extern REVERBInfo rvb; @@ -224,8 +211,6 @@ extern unsigned short spuCtrl; extern unsigned short spuStat; extern unsigned short spuIrq; extern unsigned long spuAddr; -extern int bEndThread; -extern int bThreadEnded; extern int bSpuInit; extern unsigned int dwNewChannel; extern unsigned int dwChannelOn;