X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;h=1a51cd729a5784f39ddd41816b18ad31539a9862;hp=2493a1e58d55e99fc8e1d537a6a12d8ad2ef7af9;hb=f2aec10aa8e3befe7e89070e8559d070835cc23e;hpb=7e44d49d2a65d6e45d6f99f72a8cccdb02654aae diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c index 2493a1e5..1a51cd72 100644 --- a/plugins/dfsound/registers.c +++ b/plugins/dfsound/registers.c @@ -173,10 +173,13 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) //------------------------------------------------// case 14: // loop? s_chan[ch].pLoop=spuMemC+((val&~1)<<3); + if(s_chan[ch].bJump) + // real machine would be most likely still doing the last block and use new value for the jump; + // but we decode ahead a bit and already did the jump part, so compensate for that now. + s_chan[ch].pCurr=s_chan[ch].pLoop; break; //------------------------------------------------// } - iSpuAsyncWait=0; return; } @@ -343,8 +346,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) if ((r & ~0x3f) == H_Reverb) rvb.dirty = 1; // recalculate on next update - - iSpuAsyncWait=0; } //////////////////////////////////////////////////////////////////////// @@ -355,8 +356,6 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) { const unsigned long r=reg&0xfff; - iSpuAsyncWait=0; - if(r>=0x0c00 && r<0x0d80) { switch(r&0x0f) @@ -429,6 +428,7 @@ static void SoundOn(int start,int end,unsigned short val) s_chan[ch].bStop=0; s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3); + s_chan[ch].bJump=0; dwNewChannel|=(1<