X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu.c;h=66ab15036ccd8d61c897d52b5085ee0f2d193a5c;hp=1d5e28f50b51ebee26b19cf783cf9a46df774f90;hb=9ad8abfa940cd5c13eb0653639ea86736b65a2c4;hpb=011755d7a88f7128d04a14136e9fd61870706dcf

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 1d5e28f5..66ab1503 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -238,10 +238,7 @@ INLINE void StartSound(int ch)
  StartADSR(ch);
  StartREVERB(ch);
 
- // fussy timing issues - do in VoiceOn
- //s_chan[ch].pCurr=s_chan[ch].pStart;                   // set sample start
- //s_chan[ch].bStop=0;
- //s_chan[ch].bOn=1;
+ s_chan[ch].prevflags=2;
 
  s_chan[ch].SB[26]=0;                                  // init mixing vars
  s_chan[ch].SB[27]=0;
@@ -254,6 +251,8 @@ INLINE void StartSound(int ch)
  s_chan[ch].spos=0;
 
  spu.dwNewChannel&=~(1<<ch);                           // clear new channel bit
+ spu.dwChannelOn|=1<<ch;
+ spu.dwChannelDead&=~(1<<ch);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -765,10 +764,9 @@ static void do_channels(int ns_to)
    else
     d = do_samples_default(ch, ns_to);
 
-   d = MixADSR(ch, d);
+   d = MixADSR(&s_chan[ch].ADSRX, d);
    if (d < ns_to) {
     spu.dwChannelOn &= ~(1 << ch);
-    s_chan[ch].bStop = 1;
     s_chan[ch].ADSRX.EnvelopeVol = 0;
     memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
    }