X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=0601bf5c0c0353c491b83e5d6b91948512603f77;hp=3969469546902b20f1c80590be6c97b7f20c8d34;hb=6f6fe96900374d8744473ce240279e66d1260191;hpb=3fc2a4c27be8c8cd5f8cf53a0d56c263275b8501 diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c index 39694695..0601bf5c 100644 --- a/plugins/dfsound/freeze.c +++ b/plugins/dfsound/freeze.c @@ -22,12 +22,29 @@ #include "externals.h" #include "registers.h" #include "spu.h" -#include "regs.h" //////////////////////////////////////////////////////////////////////// // freeze structs //////////////////////////////////////////////////////////////////////// +typedef struct +{ + int AttackModeExp; + int AttackTime; + int DecayTime; + int SustainLevel; + int SustainModeExp; + int SustainModeDec; + int SustainTime; + int ReleaseModeExp; + unsigned int ReleaseVal; + int ReleaseTime; + int ReleaseStartTime; + int ReleaseVol; + int lTime; + int lVolume; +} ADSRInfo; + typedef struct { int State; @@ -41,9 +58,9 @@ typedef struct int ReleaseModeExp; int ReleaseRate; int EnvelopeVol; - long lVolume; - long lDummy1; - long lDummy2; + int lVolume; + int lDummy1; + int lDummy2; } ADSRInfoEx_orig; typedef struct @@ -59,9 +76,9 @@ typedef struct int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :) int sval; - unsigned char * pStart; // start ptr into sound mem - unsigned char * pCurr; // current pos in sound mem - unsigned char * pLoop; // loop ptr in sound mem + int iStart; // start ptr into sound mem + int iCurr; // current pos in sound mem + int iLoop; // loop ptr in sound mem int bOn; // is channel active (sample playing?) int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase) @@ -121,7 +138,7 @@ extern int lastch; // we want to retain compatibility between versions, // so use original channel struct -static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch) +static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch) { memset(d, 0, sizeof(*d)); d->bNew = !!(dwNewChannel & (1<spos = s->spos; d->sinc = s->sinc; memcpy(d->SB, s->SB, sizeof(d->SB)); - d->pStart = s->pStart; - d->pCurr = s->pCurr; - d->pLoop = s->pLoop; + d->iStart = (regAreaGet(ch,6)&~1)<<3; + d->iCurr = 0; // set by the caller + d->iLoop = 0; // set by the caller d->bOn = !!(dwChannelOn & (1<bStop = s->bStop; d->bReverb = s->bReverb; - d->iActFreq = s->iActFreq; - d->iUsedFreq = s->iUsedFreq; + d->iActFreq = 1; + d->iUsedFreq = 2; d->iLeftVolume = s->iLeftVolume; - d->bIgnoreLoop = s->bIgnoreLoop; + // this one is nasty but safe, save compat is important + d->bIgnoreLoop = (s->prevflags ^ 2) << 1; d->iRightVolume = s->iRightVolume; d->iRawPitch = s->iRawPitch; - d->s_1 = s->s_1; - d->s_2 = s->s_2; + d->s_1 = s->SB[27]; // yes it's reversed + d->s_2 = s->SB[26]; d->bRVBActive = s->bRVBActive; - d->iRVBOffset = s->iRVBOffset; - d->iRVBRepeat = s->iRVBRepeat; d->bNoise = s->bNoise; d->bFMod = s->bFMod; - d->iRVBNum = s->iRVBNum; - d->iOldNoise = s->iOldNoise; d->ADSRX.State = s->ADSRX.State; d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp; d->ADSRX.AttackRate = s->ADSRX.AttackRate; @@ -164,7 +178,7 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch) d->ADSRX.lVolume = d->bOn; // hmh } -static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch) +static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) { memset(d, 0, sizeof(*d)); if (s->bNew) dwNewChannel |= 1<spos = s->spos; d->sinc = s->sinc; memcpy(d->SB, s->SB, sizeof(d->SB)); - d->pStart = (void *)((long)s->pStart & 0x7fff0); - d->pCurr = (void *)((long)s->pCurr & 0x7fff0); - d->pLoop = (void *)((long)s->pLoop & 0x7fff0); - if (s->bOn) dwChannelOn |= 1<pCurr = (void *)((long)s->iCurr & 0x7fff0); + d->pLoop = (void *)((long)s->iLoop & 0x7fff0); d->bStop = s->bStop; d->bReverb = s->bReverb; - d->iActFreq = s->iActFreq; - d->iUsedFreq = s->iUsedFreq; d->iLeftVolume = s->iLeftVolume; - d->bIgnoreLoop = s->bIgnoreLoop; d->iRightVolume = s->iRightVolume; d->iRawPitch = s->iRawPitch; - d->s_1 = s->s_1; - d->s_2 = s->s_2; d->bRVBActive = s->bRVBActive; - d->iRVBOffset = s->iRVBOffset; - d->iRVBRepeat = s->iRVBRepeat; d->bNoise = s->bNoise; d->bFMod = s->bFMod; - d->iRVBNum = s->iRVBNum; - d->iOldNoise = s->iOldNoise; + d->prevflags = (s->bIgnoreLoop >> 1) ^ 2; d->ADSRX.State = s->ADSRX.State; d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp; d->ADSRX.AttackRate = s->ADSRX.AttackRate; @@ -204,6 +208,8 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch) d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp; d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate; d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol; + if (s->bOn) dwChannelOn |= 1<ADSRX.EnvelopeVol = 0; } //////////////////////////////////////////////////////////////////////// @@ -227,8 +233,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) if(ulFreezeMode==2) return 1; // info mode? ok, bye // save mode: - RemoveTimer(); // stop timer - memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos memcpy(pF->cSPUPort,regArea,0x200); @@ -247,30 +251,21 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) pFO->spuAddr=spuAddr; if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d; - dwChannelOn&=~dwPendingChanOff; - dwPendingChanOff=0; - for(i=0;is_chan[i],&s_chan[i],i); - if(pFO->s_chan[i].pStart) - pFO->s_chan[i].pStart-=(unsigned long)spuMemC; - if(pFO->s_chan[i].pCurr) - pFO->s_chan[i].pCurr-=(unsigned long)spuMemC; - if(pFO->s_chan[i].pLoop) - pFO->s_chan[i].pLoop-=(unsigned long)spuMemC; + if(s_chan[i].pCurr) + pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC; + if(s_chan[i].pLoop) + pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC; } - SetupTimer(); // sound processing on again - return 1; //--------------------------------------------------// } if(ulFreezeMode!=0) return 0; // bad mode? bye - RemoveTimer(); // we stop processing while doing the save! - memcpy(spuMem,pF->cSPURam,0x80000); // get ram memcpy(regArea,pF->cSPUPort,0x200); @@ -278,7 +273,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) SPUplayADPCMchannel(&pF->xaS); xapGlobal=0; - dwPendingChanOff=0; if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5) LoadStateV5(pF); @@ -301,7 +295,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) // fix to prevent new interpolations from crashing for(i=0;is_chan[i],i); - s_chan[i].pStart+=(unsigned long)spuMemC; s_chan[i].pCurr+=(unsigned long)spuMemC; s_chan[i].pLoop+=(unsigned long)spuMemC; } @@ -345,12 +339,11 @@ void LoadStateUnknown(SPUFreeze_t * pF) { s_chan[i].bStop=0; s_chan[i].pLoop=spuMemC; - s_chan[i].pStart=spuMemC; - s_chan[i].pLoop=spuMemC; } dwNewChannel=0; dwChannelOn=0; + dwChannelDead=0; pSpuIrq=0; for(i=0;i<0xc0;i++)