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
spu: rename dwChannelOn to something more suitable
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
freeze.c
diff --git
a/plugins/dfsound/freeze.c
b/plugins/dfsound/freeze.c
index
3bdbab1
..
a9843ae
100644
(file)
--- a/
plugins/dfsound/freeze.c
+++ b/
plugins/dfsound/freeze.c
@@
-148,7
+148,7
@@
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
d->iStart = (regAreaGet(ch,6)&~1)<<3;
\r
d->iCurr = 0; // set by the caller
\r
d->iLoop = 0; // set by the caller
\r
d->iStart = (regAreaGet(ch,6)&~1)<<3;
\r
d->iCurr = 0; // set by the caller
\r
d->iLoop = 0; // set by the caller
\r
- d->bOn = !!(spu.dwChannel
On
& (1<<ch));
\r
+ d->bOn = !!(spu.dwChannel
sAudible
& (1<<ch));
\r
d->bStop = s->ADSRX.State == ADSR_RELEASE;
\r
d->bReverb = s->bReverb;
\r
d->iActFreq = 1;
\r
d->bStop = s->ADSRX.State == ADSR_RELEASE;
\r
d->bReverb = s->bReverb;
\r
d->iActFreq = 1;
\r
@@
-209,7
+209,7
@@
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
\r
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
\r
- if (s->bOn) spu.dwChannel
On
|= 1<<ch;
\r
+ if (s->bOn) spu.dwChannel
sAudible
|= 1<<ch;
\r
else d->ADSRX.EnvelopeVol = 0;
\r
}
\r
\r
else d->ADSRX.EnvelopeVol = 0;
\r
}
\r
\r
@@
-334,7
+334,7
@@
void LoadStateV5(SPUFreeze_t * pF)
spu.decode_pos = pFO->decode_pos & 0x1ff;
\r
\r
spu.dwNewChannel=0;
\r
spu.decode_pos = pFO->decode_pos & 0x1ff;
\r
\r
spu.dwNewChannel=0;
\r
- spu.dwChannel
On
=0;
\r
+ spu.dwChannel
sAudible
=0;
\r
spu.dwChannelDead=0;
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
spu.dwChannelDead=0;
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
@@
-357,7
+357,7
@@
void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
}
\r
\r
spu.dwNewChannel=0;
\r
}
\r
\r
spu.dwNewChannel=0;
\r
- spu.dwChannel
On
=0;
\r
+ spu.dwChannel
sAudible
=0;
\r
spu.dwChannelDead=0;
\r
spu.pSpuIrq=spu.spuMemC;
\r
\r
spu.dwChannelDead=0;
\r
spu.pSpuIrq=spu.spuMemC;
\r
\r