// freeze structs\r
////////////////////////////////////////////////////////////////////////\r
\r
+typedef struct\r
+{\r
+ int AttackModeExp;\r
+ int AttackTime;\r
+ int DecayTime;\r
+ int SustainLevel;\r
+ int SustainModeExp;\r
+ int SustainModeDec;\r
+ int SustainTime;\r
+ int ReleaseModeExp;\r
+ unsigned int ReleaseVal;\r
+ int ReleaseTime;\r
+ int ReleaseStartTime; \r
+ int ReleaseVol; \r
+ int lTime;\r
+ int lVolume;\r
+} ADSRInfo;\r
+\r
typedef struct\r
{\r
int State;\r
int ReleaseModeExp;\r
int ReleaseRate;\r
int EnvelopeVol;\r
- long lVolume;\r
- long lDummy1;\r
- long lDummy2;\r
+ int lVolume;\r
+ int lDummy1;\r
+ int lDummy2;\r
} ADSRInfoEx_orig;\r
\r
typedef struct\r
int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)\r
int sval;\r
\r
- unsigned char * pStart; // start ptr into sound mem\r
- unsigned char * pCurr; // current pos in sound mem\r
- unsigned char * pLoop; // loop ptr in sound mem\r
+ int iStart; // start ptr into sound mem\r
+ int iCurr; // current pos in sound mem\r
+ int iLoop; // loop ptr in sound mem\r
\r
int bOn; // is channel active (sample playing?)\r
int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pStart = (unsigned char *)((regAreaGet(ch,6)&~1)<<3);\r
- d->pCurr = s->pCurr;\r
- d->pLoop = s->pLoop;\r
+ d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
+ d->iCurr = 0; // set by the caller\r
+ d->iLoop = 0; // set by the caller\r
d->bOn = !!(dwChannelOn & (1<<ch));\r
d->bStop = s->bStop;\r
d->bReverb = s->bReverb;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pCurr = (void *)((long)s->pCurr & 0x7fff0);\r
- d->pLoop = (void *)((long)s->pLoop & 0x7fff0);\r
- if (s->bOn) dwChannelOn |= 1<<ch;\r
+ d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
+ d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
d->bStop = s->bStop;\r
d->bReverb = s->bReverb;\r
d->iLeftVolume = s->iLeftVolume;\r
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
+ if (s->bOn) dwChannelOn |= 1<<ch;\r
+ else d->ADSRX.EnvelopeVol = 0;\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- if(!(s_chan[i].prevflags&2))\r
- dwChannelOn&=~(1<<i);\r
-\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
- if(pFO->s_chan[i].pCurr)\r
- pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;\r
- if(pFO->s_chan[i].pLoop)\r
- pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;\r
+ if(s_chan[i].pCurr)\r
+ pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
+ if(s_chan[i].pLoop)\r
+ pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
}\r
\r
return 1;\r