X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;h=983af8c91627829eefc29606b44385ca3bd90167;hp=83b9e438f95555686896d4833d532a68d4728bbb;hb=77d6fd631e4c4efc26333ae43888855b9961493e;hpb=1775933abd26d2e282c4e0b4093778d204a0038d

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 83b9e438..983af8c9 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -169,6 +169,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
        s_chan[ch].pLoop=spuMemC+((unsigned long)((val<<3)&~0xf));
        //s_chan[ch].bIgnoreLoop=1;
        //ReleaseMutex(s_chan[ch].hMutex);                    // -> oki, on with the thread
+       dwChannelDead&=~(1<<ch);
        break;
      //------------------------------------------------//
     }
@@ -418,17 +419,19 @@ void SoundOn(int start,int end,unsigned short val)     // SOUND ON PSX COMAND
 
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels
   {
-   if((val&1) && s_chan[ch].pStart)                    // mmm... start has to be set before key on !?!
+   if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!
     {
      s_chan[ch].bIgnoreLoop=0;
 
      // do this here, not in StartSound
      // - fixes fussy timing issues
      s_chan[ch].bStop=0;
-     s_chan[ch].pCurr=s_chan[ch].pStart;
+     s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
+     s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3);
 
      dwNewChannel|=(1<<ch);                            // bitfield for faster testing
      dwChannelOn|=1<<ch;
+     dwChannelDead&=~(1<<ch);
     }
   }
 }