From 381ea10346ab85b2f2d46f33d28461211e239c0a Mon Sep 17 00:00:00 2001
From: notaz
Date: Sat, 30 Jul 2011 02:42:28 +0300
Subject: spu: some misc refactoring/cleanup

---
 plugins/dfsound/freeze.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'plugins/dfsound/freeze.c')

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 3969469..41c6f16 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;
@@ -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;
-- 
cgit v1.2.3