spu.dwNewChannel&=~(1<<ch); // clear new channel bit
spu.dwChannelDead&=~(1<<ch);
- if (s_chan->iRawPitch)
- spu.dwChannelsAudible|=1<<ch;
+ spu.dwChannelsAudible|=1<<ch;
}
static void StartSound(int ch)
int vl, vr;int gpos;
vl = (spos >> 6) & ~3;
gpos = SB[28];
- vr=(gauss[vl]*(int)gval0)&~2047;
- vr+=(gauss[vl+1]*gval(1))&~2047;
- vr+=(gauss[vl+2]*gval(2))&~2047;
- vr+=(gauss[vl+3]*gval(3))&~2047;
- fa = vr>>11;
+ vr=(gauss[vl]*(int)gval0) >> 15;
+ vr+=(gauss[vl+1]*gval(1)) >> 15;
+ vr+=(gauss[vl+2]*gval(2)) >> 15;
+ vr+=(gauss[vl+3]*gval(3)) >> 15;
+ fa = vr;
} break;
//--------------------------------------------------//
case 1: // simple interpolation
start = s_chan->pLoop;
}
- else
- check_irq(ch, start); // hack, see check_irq below..
+
+ check_irq(ch, start);
predict_nr = start[0];
shift_factor = predict_nr & 0xf;
decode_block_data(SB, start + 2, predict_nr, shift_factor);
flags = start[1];
- if (flags & 4 && (!s_chan->bIgnoreLoop))
+ if (flags & 4 && !s_chan->bIgnoreLoop)
s_chan->pLoop = start; // loop adress
start += 16;
- if (flags & 1) { // 1: stop/loop
- start = s_chan->pLoop;
- check_irq(ch, start); // hack.. :(
- }
-
- if (start - spu.spuMemC >= 0x80000)
- start = spu.spuMemC;
-
s_chan->pCurr = start; // store values for next cycle
s_chan->prevflags = flags;
start = s_chan->pLoop;
}
- else
- check_irq(ch, start);
+
+ check_irq(ch, start);
flags = start[1];
- if (flags & 4)
+ if (flags & 4 && !s_chan->bIgnoreLoop)
s_chan->pLoop = start;
start += 16;
- if (flags & 1) {
- start = s_chan->pLoop;
- check_irq(ch, start);
- }
-
s_chan->pCurr = start;
s_chan->prevflags = flags;
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
- if (block == spu.pSpuIrq) // hack.. (see decode_block)
- break;
}
pos += 28 << 16;
}
d = SkipADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
spu.dwChannelsAudible &= ~(1 << ch);
+ s_chan->ADSRX.State = ADSR_RELEASE;
s_chan->ADSRX.EnvelopeVol = 0;
}
}
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol_l >> 15;
+ d = d * vol_l >> 14;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol_r >> 15;
+ d = d * vol_r >> 14;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;