spu: compact chan structure a bit

[pcsx_rearmed.git] / plugins / dfsound / registers.c

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 5ab519b..19a0a46 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -76,13 +76,14 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
      //------------------------------------------------// level with pre-calcs\r
      case 8:\r
        {\r
-        const unsigned long lval=val;unsigned long lx;\r
+        const unsigned long lval=val;\r
         //---------------------------------------------//\r
         s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; \r
         s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;\r
         s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;\r
         s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;\r
         //---------------------------------------------//\r
+#if 0\r
         if(!iDebugMode) break;\r
         //---------------------------------------------// stuff below is only for debug mode\r
 \r
@@ -110,12 +111,13 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
          }\r
         s_chan[ch].ADSR.DecayTime =                   // so calc how long does it take to run from 100% to the wanted sus level\r
          (lx*(1024-s_chan[ch].ADSR.SustainLevel))/1024;\r
+#endif\r
        }\r
       break;\r
      //------------------------------------------------// adsr times with pre-calcs\r
      case 10:\r
       {\r
-       const unsigned long lval=val;unsigned long lx;\r
+       const unsigned long lval=val;\r
 \r
        //----------------------------------------------//\r
        s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;\r
@@ -124,6 +126,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
        s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;\r
        s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;\r
        //----------------------------------------------//\r
+#if 0\r
        if(!iDebugMode) break;\r
        //----------------------------------------------// stuff below is only for debug mode\r
 \r
@@ -155,6 +158,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
        if(lval & 0x4000)                               // add/dec flag\r
             s_chan[ch].ADSR.SustainModeDec=-1;\r
        else s_chan[ch].ADSR.SustainModeDec=1;\r
+#endif\r
       }\r
      break;\r
      //------------------------------------------------// adsr volume... mmm have to investigate this\r
@@ -362,9 +366,9 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      case 12:                                          // get adsr vol\r
       {\r
        const int ch=(r>>4)-0xc0;\r
-       if(s_chan[ch].bNew) return 1;                   // we are started, but not processed? return 1\r
-       if(s_chan[ch].ADSRX.lVolume &&                  // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
-          !s_chan[ch].ADSRX.EnvelopeVol)                   \r
+       if(dwNewChannel&(1<<ch)) return 1;              // we are started, but not processed? return 1\r
+       if((dwChannelOn&(1<<ch)) &&                     // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
+          !s_chan[ch].ADSRX.EnvelopeVol)\r
         return 1;\r
        return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);\r
       }\r
@@ -424,15 +428,14 @@ void SoundOn(int start,int end,unsigned short val)     // SOUND ON PSX COMAND
    if((val&1) && s_chan[ch].pStart)                    // mmm... start has to be set before key on !?!\r
     {\r
      s_chan[ch].bIgnoreLoop=0;\r
-     s_chan[ch].bNew=1;\r
 \r
      // do this here, not in StartSound\r
      // - fixes fussy timing issues\r
      s_chan[ch].bStop=0;\r
-     s_chan[ch].bOn=1;\r
      s_chan[ch].pCurr=s_chan[ch].pStart;\r
 \r
      dwNewChannel|=(1<<ch);                            // bitfield for faster testing\r
+     dwChannelOn|=1<<ch;\r
     }\r
   }\r
 }\r
@@ -452,7 +455,6 @@ void SoundOff(int start,int end,unsigned short val)    // SOUND OFF PSX COMMAND
 \r
      // Jungle Book - Rhythm 'n Groove\r
      // - turns off buzzing sound (loop hangs)\r
-     s_chan[ch].bNew=0;\r
      dwNewChannel &= ~(1<<ch);\r
     }                                                  \r
   }\r
@@ -493,14 +495,7 @@ void NoiseOn(int start,int end,unsigned short val)     // NOISE ON PSX COMMAND
 \r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   if(val&1)                                           // -> noise on/off\r
-    {\r
-     s_chan[ch].bNoise=1;\r
-    }\r
-   else \r
-    {\r
-     s_chan[ch].bNoise=0;\r
-    }\r
+   s_chan[ch].bNoise=val&1;                            // -> noise on/off\r
   }\r
 }\r
 \r
@@ -513,8 +508,6 @@ void NoiseOn(int start,int end,unsigned short val)     // NOISE ON PSX COMMAND
 \r
 void SetVolumeL(unsigned char ch,short vol)            // LEFT VOLUME\r
 {\r
- s_chan[ch].iLeftVolRaw=vol;\r
-\r
  if(vol&0x8000)                                        // sweep?\r
   {\r
    short sInc=1;                                       // -> sweep up?\r
@@ -541,8 +534,6 @@ void SetVolumeL(unsigned char ch,short vol)            // LEFT VOLUME
 \r
 void SetVolumeR(unsigned char ch,short vol)            // RIGHT VOLUME\r
 {\r
- s_chan[ch].iRightVolRaw=vol;\r
-\r
  if(vol&0x8000)                                        // comments... see above :)\r
   {\r
    short sInc=1;\r
@@ -590,13 +581,6 @@ void ReverbOn(int start,int end,unsigned short val)    // REVERB ON PSX COMMAND
 \r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   if(val&1)                                           // -> reverb on/off\r
-    {\r
-     s_chan[ch].bReverb=1;\r
-    }\r
-   else \r
-    {\r
-     s_chan[ch].bReverb=0;\r
-    }\r
+   s_chan[ch].bReverb=val&1;                           // -> reverb on/off\r
   }\r
 }\r