X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=d09a9b00ea83643bd341af249c55931f5d812bb1;hp=cb0d75ecd9d03b0b873b47d198c2fc18a8a227a3;hb=174c454a98a71475b72958c9f76293af7d6fb502;hpb=6d866bb7894b252fc430a24a97769511d5ead1ca

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index cb0d75ec..d09a9b00 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -121,7 +121,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<<ch));
@@ -141,15 +141,11 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  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->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 +160,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<<ch;
@@ -172,9 +168,9 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
  d->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->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<<ch;
  d->bStop = s->bStop;
  d->bReverb = s->bReverb;
@@ -184,15 +180,9 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
  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->ADSRX.State = s->ADSRX.State;
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;
@@ -247,6 +237,9 @@ 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;i<MAXCHAN;i++)
     {
      save_channel(&pFO->s_chan[i],&s_chan[i],i);
@@ -275,6 +268,7 @@ 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);
@@ -311,7 +305,7 @@ void LoadStateV5(SPUFreeze_t * pF)
  pFO=(SPUOSSFreeze_t *)(pF+1);
 
  spuIrq = pFO->spuIrq;
- if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;
+ if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;
 
  if(pFO->spuAddr)
   {
@@ -321,6 +315,7 @@ void LoadStateV5(SPUFreeze_t * pF)
 
  dwNewChannel=0;
  dwChannelOn=0;
+ dwChannelDead=0;
  for(i=0;i<MAXCHAN;i++)
   {
    load_channel(&s_chan[i],&pFO->s_chan[i],i);
@@ -347,6 +342,7 @@ void LoadStateUnknown(SPUFreeze_t * pF)
 
  dwNewChannel=0;
  dwChannelOn=0;
+ dwChannelDead=0;
  pSpuIrq=0;
 
  for(i=0;i<0xc0;i++)