summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-20 03:08:15 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-20 03:08:15 +0000
commit8b3e743e6b8ecc1f95c3d681322c9e1fce0cc0e4 (patch)
tree67b0abbbbd443402c7bedf89fac4938c283c2d31 /plugins
parent4b580f74d926e824d94f3bf301a89b7fd359d922 (diff)
downloadpcsxr-8b3e743e6b8ecc1f95c3d681322c9e1fce0cc0e4.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@52965 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dfsound/freeze.c7
-rw-r--r--plugins/dfsound/spu.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index f38cfc6e..2551e608 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -55,6 +55,8 @@ typedef struct
void LoadStateV5(SPUFreeze_t * pF); // newest version
void LoadStateUnknown(SPUFreeze_t * pF); // unknown format
+
+extern int lastch;
////////////////////////////////////////////////////////////////////////
// SPUFREEZE: called by main emu on savestate load/save
@@ -128,6 +130,9 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
LoadStateV5(pF);
else LoadStateUnknown(pF);
+ spuAddr = 0xffffffff;
+ lastch = -1;
+
// repair some globals
for(i=0;i<=62;i+=2)
SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
@@ -169,8 +174,6 @@ void LoadStateV5(SPUFreeze_t * pF)
s_chan[i].iMute=0;
s_chan[i].iIrqDone=0;
}
-
- spuAddr = 0xffffffff;
}
////////////////////////////////////////////////////////////////////////
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 9e532cb0..3670d458 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -110,7 +110,7 @@ int iFMod[NSSIZE];
int iCycle=0;
short * pS;
-static int lastch=-1; // last channel processed on spu irq in timer mode
+int lastch=-1; // last channel processed on spu irq in timer mode
static int lastns=0; // last ns pos
static int iSecureStart=0; // secure start counter