spu: clean up unneeded code

[pcsx_rearmed.git] / plugins / dfsound / freeze.c

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index d09a9b0..6caa6bf 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -22,7 +22,6 @@
 #include "externals.h"\r
 #include "registers.h"\r
 #include "spu.h"\r
-#include "regs.h"\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 // freeze structs\r
@@ -129,16 +128,16 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pStart = s->pStart;\r
+ d->pStart = (unsigned char *)((regAreaGet(ch,6)&~1)<<3);\r
  d->pCurr = s->pCurr;\r
  d->pLoop = s->pLoop;\r
  d->bOn = !!(dwChannelOn & (1<<ch));\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
- d->iActFreq = s->iActFreq;\r
- d->iUsedFreq = s->iUsedFreq;\r
+ d->iActFreq = 1;\r
+ d->iUsedFreq = 2;\r
  d->iLeftVolume = s->iLeftVolume;\r
- d->bIgnoreLoop = s->bIgnoreLoop;\r
+ d->bIgnoreLoop = 0;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
  d->s_1 = s->SB[27]; // yes it's reversed\r
@@ -168,16 +167,12 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pStart = (void *)((long)s->pStart & 0x7fff0);\r
  d->pCurr = (void *)((long)s->pCurr & 0x7fff0);\r
  d->pLoop = (void *)((long)s->pLoop & 0x7fff0);\r
  if (s->bOn) dwChannelOn |= 1<<ch;\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
- d->iActFreq = s->iActFreq;\r
- d->iUsedFreq = s->iUsedFreq;\r
  d->iLeftVolume = s->iLeftVolume;\r
- d->bIgnoreLoop = s->bIgnoreLoop;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
  d->bRVBActive = s->bRVBActive;\r
@@ -243,8 +238,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
    for(i=0;i<MAXCHAN;i++)\r
     {\r
      save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
-     if(pFO->s_chan[i].pStart)\r
-      pFO->s_chan[i].pStart-=(unsigned long)spuMemC;\r
      if(pFO->s_chan[i].pCurr)\r
       pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;\r
      if(pFO->s_chan[i].pLoop)\r
@@ -320,7 +313,6 @@ void LoadStateV5(SPUFreeze_t * pF)
   {\r
    load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
 \r
-   s_chan[i].pStart+=(unsigned long)spuMemC;\r
    s_chan[i].pCurr+=(unsigned long)spuMemC;\r
    s_chan[i].pLoop+=(unsigned long)spuMemC;\r
   }\r
@@ -336,8 +328,6 @@ void LoadStateUnknown(SPUFreeze_t * pF)
   {\r
    s_chan[i].bStop=0;\r
    s_chan[i].pLoop=spuMemC;\r
-   s_chan[i].pStart=spuMemC;\r
-   s_chan[i].pLoop=spuMemC;\r
   }\r
 \r
  dwNewChannel=0;\r