diff options
author | twinaphex | 2014-12-21 23:19:03 +0100 |
---|---|---|
committer | twinaphex | 2014-12-21 23:19:03 +0100 |
commit | e63a9dc66d0ce5a9d88353f880ef88a6590d06fd (patch) | |
tree | 6489b0d548ece33a4e92df40db442d839b934eb2 /plugins/dfsound/spu.c | |
parent | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (diff) | |
parent | 5ec7acdfb1bc4c3da372f7f8e1a0a1022becce21 (diff) | |
download | pcsx_rearmed-e63a9dc66d0ce5a9d88353f880ef88a6590d06fd.tar.gz pcsx_rearmed-e63a9dc66d0ce5a9d88353f880ef88a6590d06fd.tar.bz2 pcsx_rearmed-e63a9dc66d0ce5a9d88353f880ef88a6590d06fd.zip |
Merge https://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfsound/spu.c')
-rw-r--r-- | plugins/dfsound/spu.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index ca362b7..835555d 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -5,7 +5,7 @@ copyright : (C) 2002 by Pete Bernert email : BlackDove@addcom.de - Portions (C) Gražvydas "notaz" Ignotas, 2010-2012 + Portions (C) Gražvydas "notaz" Ignotas, 2010-2012,2014 ***************************************************************************/ /*************************************************************************** @@ -253,14 +253,13 @@ INLINE void StartSound(int ch) s_chan[ch].SB[26]=0; // init mixing vars s_chan[ch].SB[27]=0; - s_chan[ch].iSBPos=28; + s_chan[ch].iSBPos=27; + s_chan[ch].SB[28]=0; s_chan[ch].SB[29]=0; // init our interpolation helpers s_chan[ch].SB[30]=0; - - if(spu_config.iUseInterpolation>=2) // gauss interpolation? - {s_chan[ch].spos=0x30000L;s_chan[ch].SB[28]=0;} // -> start with more decoding - else {s_chan[ch].spos=0x10000L;s_chan[ch].SB[31]=0;} // -> no/simple interpolation starts with one 44100 decoding + s_chan[ch].SB[31]=0; + s_chan[ch].spos=0; spu.dwNewChannel&=~(1<<ch); // clear new channel bit } @@ -738,7 +737,7 @@ void do_samples(unsigned int cycles_to) // an IRQ. if (unlikely((spu.spuCtrl & CTRL_IRQ) - && spu.pSpuIrq && spu.pSpuIrq < spu.spuMemC+0x1000)) + && spu.pSpuIrq < spu.spuMemC+0x1000)) { int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff; int left = (irq_pos - spu.decode_pos) & 0x1ff; @@ -1027,7 +1026,7 @@ long CALLBACK SPUinit(void) spu.spuAddr = 0xffffffff; spu.decode_pos = 0; memset((void *)s_chan, 0, sizeof(s_chan)); - spu.pSpuIrq = 0; + spu.pSpuIrq = spu.spuMemC; SetupStreams(); // prepare streaming |