X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=1c037fe188b4c78aef1e1bc5f68fbe65a1433fbf;hp=3969469546902b20f1c80590be6c97b7f20c8d34;hb=69b09c0d33efd71ebe4886cfae41c162803683d5;hpb=3fc2a4c27be8c8cd5f8cf53a0d56c263275b8501

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 39694695..1c037fe1 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -22,7 +22,6 @@
 #include "externals.h"
 #include "registers.h"
 #include "spu.h"
-#include "regs.h"
 
 ////////////////////////////////////////////////////////////////////////
 // freeze structs
@@ -121,7 +120,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));
@@ -129,27 +128,24 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  d->spos = s->spos;
  d->sinc = s->sinc;
  memcpy(d->SB, s->SB, sizeof(d->SB));
- d->pStart = s->pStart;
+ d->pStart = (unsigned char *)((regAreaGet(ch,6)&~1)<<3);
  d->pCurr = s->pCurr;
  d->pLoop = s->pLoop;
  d->bOn = !!(dwChannelOn & (1<<ch));
  d->bStop = s->bStop;
  d->bReverb = s->bReverb;
- d->iActFreq = s->iActFreq;
- d->iUsedFreq = s->iUsedFreq;
+ d->bIgnoreLoop = s->bJump;
+ d->iActFreq = 1;
+ d->iUsedFreq = 2;
  d->iLeftVolume = s->iLeftVolume;
- d->bIgnoreLoop = s->bIgnoreLoop;
+ d->bIgnoreLoop = 0;
  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,27 +168,18 @@ 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 = (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;
- 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->bJump = s->bIgnoreLoop;
  d->ADSRX.State = s->ADSRX.State;
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;
@@ -253,8 +240,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
    for(i=0;i<MAXCHAN;i++)
     {
      save_channel(&pFO->s_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)
@@ -325,11 +310,11 @@ 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);
 
-   s_chan[i].pStart+=(unsigned long)spuMemC;
    s_chan[i].pCurr+=(unsigned long)spuMemC;
    s_chan[i].pLoop+=(unsigned long)spuMemC;
   }
@@ -345,12 +330,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++)