ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2-X: Fixed a screwup from the previous commit. A bit of code cleanup got lost in translation. ;) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@511 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-02-16 20:30:54 +00:00
parent 24ed5ac12e
commit 54baa99158
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/spu2-x/src/Mixer.cpp
View File

@ -183,10 +183,11 @@ static void __forceinline __fastcall GetNextDataBuffered( V_Core& thiscore, V_Vo
{ {
if(vc.LoopFlags & XAFLAG_LOOP_END) if(vc.LoopFlags & XAFLAG_LOOP_END)
{ {
thiscore.Regs.ENDX |= (1 << voice);
if( vc.LoopFlags & XAFLAG_LOOP ) if( vc.LoopFlags & XAFLAG_LOOP )
{ {
vc.NextA=vc.LoopStartA; vc.NextA=vc.LoopStartA;
thiscore.Regs.ENDX|=1<<voice;
} }
else else
{ {
@ -331,6 +332,7 @@ static __forceinline void CalculateADSR( V_Core& thiscore, V_Voice& vc )
DebugCores[core].Voices[voice].lastStopReason = 2; DebugCores[core].Voices[voice].lastStopReason = 2;
} }
vc.Stop(); vc.Stop();
thiscore.Regs.ENDX |= (1 << voice);
} }
jASSUME( vc.ADSR.Value >= 0 ); // ADSR should never be negative... jASSUME( vc.ADSR.Value >= 0 ); // ADSR should never be negative...

1
plugins/spu2-x/src/Spu2.cpp
View File

@ -239,7 +239,6 @@ void V_Voice::Stop()
{ {
ADSR.Value = 0; ADSR.Value = 0;
ADSR.Phase = 0; ADSR.Phase = 0;
//Cores[core].Regs.ENDX|=(1<<vc);
} }
static const int TickInterval = 768; static const int TickInterval = 768;