spu: some misc refactoring/cleanup

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

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 3969469..41c6f16 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -121,7 +121,7 @@ extern int lastch;
 \r
 // we want to retain compatibility between versions,\r
 // so use original channel struct\r
-static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)\r
+static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
  d->bNew = !!(dwNewChannel & (1<<ch));\r
@@ -141,15 +141,11 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  d->bIgnoreLoop = s->bIgnoreLoop;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
- d->s_1 = s->s_1;\r
- d->s_2 = s->s_2;\r
+ d->s_1 = s->SB[27]; // yes it's reversed\r
+ d->s_2 = s->SB[26];\r
  d->bRVBActive = s->bRVBActive;\r
- d->iRVBOffset = s->iRVBOffset;\r
- d->iRVBRepeat = s->iRVBRepeat;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
- d->iRVBNum = s->iRVBNum;\r
- d->iOldNoise = s->iOldNoise;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
@@ -164,7 +160,7 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  d->ADSRX.lVolume = d->bOn; // hmh\r
 }\r
 \r
-static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)\r
+static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
  if (s->bNew) dwNewChannel |= 1<<ch;\r
@@ -184,15 +180,9 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
  d->bIgnoreLoop = s->bIgnoreLoop;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
- d->s_1 = s->s_1;\r
- d->s_2 = s->s_2;\r
  d->bRVBActive = s->bRVBActive;\r
- d->iRVBOffset = s->iRVBOffset;\r
- d->iRVBRepeat = s->iRVBRepeat;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
- d->iRVBNum = s->iRVBNum;\r
- d->iOldNoise = s->iOldNoise;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r