notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spu: fix a wrong assumption
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
spu.c
diff --git
a/plugins/dfsound/spu.c
b/plugins/dfsound/spu.c
index
8099a03
..
1127cd7
100644
(file)
--- a/
plugins/dfsound/spu.c
+++ b/
plugins/dfsound/spu.c
@@
-251,8
+251,7
@@
static void StartSoundMain(int ch)
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
spu.dwChannelDead&=~(1<<ch);
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)
}
static void StartSound(int ch)
@@
-426,8
+425,8
@@
static int decode_block(void *unused, int ch, int *SB)
start = s_chan->pLoop;
}
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;
predict_nr = start[0];
shift_factor = predict_nr & 0xf;
@@
-436,19
+435,11
@@
static int decode_block(void *unused, int ch, int *SB)
decode_block_data(SB, start + 2, predict_nr, shift_factor);
flags = start[1];
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;
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;
s_chan->pCurr = start; // store values for next cycle
s_chan->prevflags = flags;
@@
-469,20
+460,15
@@
static int skip_block(int ch)
start = s_chan->pLoop;
}
start = s_chan->pLoop;
}
- else
-
check_irq(ch, start);
+
+ check_irq(ch, start);
flags = start[1];
flags = start[1];
- if (flags & 4)
+ if (flags & 4
&& !s_chan->bIgnoreLoop
)
s_chan->pLoop = start;
start += 16;
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;
s_chan->pCurr = start;
s_chan->prevflags = flags;
@@
-511,8
+497,6
@@
static void scan_for_irq(int ch, unsigned int *upd_samples)
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
- if (block == spu.pSpuIrq) // hack.. (see decode_block)
- break;
}
pos += 28 << 16;
}
}
pos += 28 << 16;
}
@@
-965,6
+949,7
@@
static void queue_channel_work(int ns_to, unsigned int silentch)
d = SkipADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
spu.dwChannelsAudible &= ~(1 << ch);
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;
}
}
s_chan->ADSRX.EnvelopeVol = 0;
}
}
@@
-1208,13
+1193,13
@@
static void do_samples_finish(int *SSumLR, int ns_to,
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol_l >> 1
5
;
+ d = d * vol_l >> 1
4
;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol_r >> 1
5
;
+ d = d * vol_r >> 1
4
;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;