notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various enhancement tweaks
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
freeze.c
diff --git
a/plugins/dfsound/freeze.c
b/plugins/dfsound/freeze.c
index
1c037fe
..
ec097c5
100644
(file)
--- a/
plugins/dfsound/freeze.c
+++ b/
plugins/dfsound/freeze.c
@@
-134,11
+134,11
@@
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
d->bOn = !!(dwChannelOn & (1<<ch));
\r
d->bStop = s->bStop;
\r
d->bReverb = s->bReverb;
\r
d->bOn = !!(dwChannelOn & (1<<ch));
\r
d->bStop = s->bStop;
\r
d->bReverb = s->bReverb;
\r
- d->bIgnoreLoop = s->bJump;
\r
d->iActFreq = 1;
\r
d->iUsedFreq = 2;
\r
d->iLeftVolume = s->iLeftVolume;
\r
d->iActFreq = 1;
\r
d->iUsedFreq = 2;
\r
d->iLeftVolume = s->iLeftVolume;
\r
- d->bIgnoreLoop = 0;
\r
+ // this one is nasty but safe, save compat is important
\r
+ d->bIgnoreLoop = (s->prevflags ^ 2) << 1;
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
d->s_1 = s->SB[27]; // yes it's reversed
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
d->s_1 = s->SB[27]; // yes it's reversed
\r
@@
-179,7
+179,7
@@
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
d->bRVBActive = s->bRVBActive;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
d->bRVBActive = s->bRVBActive;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
- d->
bJump = s->bIgnoreLoop
;
\r
+ d->
prevflags = (s->bIgnoreLoop >> 1) ^ 2
;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
@@
-214,8
+214,6
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye
\r
// save mode:
\r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye
\r
// save mode:
\r
- RemoveTimer(); // stop timer
\r
-
\r
memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos
\r
memcpy(pF->cSPUPort,regArea,0x200);
\r
\r
memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos
\r
memcpy(pF->cSPUPort,regArea,0x200);
\r
\r
@@
-234,11
+232,11
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
pFO->spuAddr=spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
\r
pFO->spuAddr=spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
\r
- dwChannelOn&=~dwPendingChanOff;
\r
- dwPendingChanOff=0;
\r
-
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
+ if(!(s_chan[i].prevflags&2))
\r
+ dwChannelOn&=~(1<<i);
\r
+
\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);
\r
if(pFO->s_chan[i].pCurr)
\r
pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);
\r
if(pFO->s_chan[i].pCurr)
\r
pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
\r
@@
-246,16
+244,12
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
\r
}
\r
\r
pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
\r
}
\r
\r
- SetupTimer(); // sound processing on again
\r
-
\r
return 1;
\r
//--------------------------------------------------//
\r
}
\r
\r
if(ulFreezeMode!=0) return 0; // bad mode? bye
\r
\r
return 1;
\r
//--------------------------------------------------//
\r
}
\r
\r
if(ulFreezeMode!=0) return 0; // bad mode? bye
\r
\r
- RemoveTimer(); // we stop processing while doing the save!
\r
-
\r
memcpy(spuMem,pF->cSPURam,0x80000); // get ram
\r
memcpy(regArea,pF->cSPUPort,0x200);
\r
\r
memcpy(spuMem,pF->cSPURam,0x80000); // get ram
\r
memcpy(regArea,pF->cSPUPort,0x200);
\r
\r
@@
-263,7
+257,6
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
SPUplayADPCMchannel(&pF->xaS);
\r
\r
xapGlobal=0;
\r
SPUplayADPCMchannel(&pF->xaS);
\r
\r
xapGlobal=0;
\r
- dwPendingChanOff=0;
\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
\r
LoadStateV5(pF);
\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
\r
LoadStateV5(pF);
\r
@@
-286,7
+279,7
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
// fix to prevent new interpolations from crashing
\r
for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
\r
\r
// fix to prevent new interpolations from crashing
\r
for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
\r
\r
- SetupTimer(); // start sound processing again
\r
+ ClearWorkingState();
\r
\r
return 1;
\r
}
\r
\r
return 1;
\r
}
\r