sort out 32/64bit savestate compat issues

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

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index ec097c5..58a8347 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -58,9 +58,9 @@ typedef struct
  int               SB[32+32];                          // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)\r
  int               sval;\r
 \r
- unsigned char *   pStart;                             // start ptr into sound mem\r
- unsigned char *   pCurr;                              // current pos in sound mem\r
- unsigned char *   pLoop;                              // loop ptr in sound mem\r
+ int               iStart;                             // start ptr into sound mem\r
+ int               iCurr;                              // current pos in sound mem\r
+ int               iLoop;                              // loop ptr in sound mem\r
 \r
  int               bOn;                                // is channel active (sample playing?)\r
  int               bStop;                              // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
@@ -128,9 +128,9 @@ 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 = (unsigned char *)((regAreaGet(ch,6)&~1)<<3);\r
- d->pCurr = s->pCurr;\r
- d->pLoop = s->pLoop;\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 = !!(dwChannelOn & (1<<ch));\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
@@ -168,8 +168,8 @@ 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->pCurr = (void *)((long)s->pCurr & 0x7fff0);\r
- d->pLoop = (void *)((long)s->pLoop & 0x7fff0);\r
+ d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
+ d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
  if (s->bOn) dwChannelOn |= 1<<ch;\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
@@ -238,10 +238,10 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
       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
-     if(pFO->s_chan[i].pLoop)\r
-      pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;\r
+     if(s_chan[i].pCurr)\r
+      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
+     if(s_chan[i].pLoop)\r
+      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
     }\r
 \r
    return 1;\r