X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;h=6b62247f8b3e5b370a16d6e3545351e56225914f;hb=5fdcf5cd320abef2c685630e3edf3598645d141e;hp=bb64658d7f96f4a68ed426bebc8ad969f0046b3d;hpb=210476c77ec6d0160e66ab6e9a45ad64fe5e50ce;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index bb64658d..6b62247f 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -112,6 +112,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
      //------------------------------------------------//
      case 14:                                          // loop?
        spu.s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);
+       spu.s_chan[ch].bIgnoreLoop = 1;
        goto upd_irq;
      //------------------------------------------------//
     }
@@ -203,12 +204,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;
     //-------------------------------------------------//
     case H_CDLeft:
-      spu.iLeftXAVol=val  & 0x7fff;
-      if(spu.cddavCallback) spu.cddavCallback(0,val);
+      spu.iLeftXAVol=(int16_t)val;
+      if(spu.cddavCallback) spu.cddavCallback(0,(int16_t)val);
       break;
     case H_CDRight:
-      spu.iRightXAVol=val & 0x7fff;
-      if(spu.cddavCallback) spu.cddavCallback(1,val);
+      spu.iRightXAVol=(int16_t)val;
+      if(spu.cddavCallback) spu.cddavCallback(1,(int16_t)val);
       break;
     //-------------------------------------------------//
     case H_FMod1:
@@ -295,7 +296,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
       {
        const int ch=(r>>4)-0xc0;
        if(spu.dwNewChannel&(1<<ch)) return 1;          // we are started, but not processed? return 1
-       if((spu.dwChannelOn&(1<<ch)) &&                 // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+       if((spu.dwChannelsAudible&(1<<ch)) &&           // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
           !spu.s_chan[ch].ADSRX.EnvelopeVol)
         return 1;
        return (unsigned short)(spu.s_chan[ch].ADSRX.EnvelopeVol>>16);
@@ -315,7 +316,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      return spu.spuCtrl;
 
     case H_SPUstat:
-     return spu.spuStat;
+     return (spu.spuStat & ~0x3F) | (spu.spuCtrl & 0x3F);
         
     case H_SPUaddr:
      return (unsigned short)(spu.spuAddr>>3);
@@ -349,10 +350,9 @@ static void SoundOn(int start,int end,unsigned short val)
 
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels
   {
-   if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!
+   if((val&1) && regAreaGetCh(ch, 6))                  // mmm... start has to be set before key on !?!
     {
-     spu.s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
-     if (spu_config.idiablofix == 0) spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);
+     spu.s_chan[ch].bIgnoreLoop = 0;
      spu.dwNewChannel|=(1<<ch);
     }
   }
@@ -484,11 +484,14 @@ static void SetPitch(int ch,unsigned short val)               // SET PITCH
  if(val>0x3fff) NP=0x3fff;                             // get pitch val
  else           NP=val;
 
- spu.s_chan[ch].iRawPitch=NP;
- spu.s_chan[ch].sinc=(NP<<4)|8;
- spu.s_chan[ch].sinc_inv=0;
- if (spu_config.iUseInterpolation == 1)
-  spu.SB[ch * SB_SIZE + 32] = 1; // -> freq change in simple interpolation mode: set flag
+ spu.s_chan[ch].iRawPitch = NP;
+ spu.s_chan[ch].sinc = NP << 4;
+ spu.s_chan[ch].sinc_inv = 0;
+ spu.SB[ch * SB_SIZE + 32] = 1; // -> freq change in simple interpolation mode: set flag
+ if (val)
+  spu.dwChannelsAudible |= 1u << ch;
+ else
+  spu.dwChannelsAudible &= ~(1u << ch);
 }
 
 ////////////////////////////////////////////////////////////////////////