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
psxmem: Add mman wrapper for Win32 and use it for PCSX ReARmed libretro Win32
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
reverb.c
diff --git
a/plugins/dfsound/reverb.c
b/plugins/dfsound/reverb.c
index
0a94ff4
..
bb5ee8e
100644
(file)
--- a/
plugins/dfsound/reverb.c
+++ b/
plugins/dfsound/reverb.c
@@
-26,25
+26,15
@@
// will be included from spu.c
\r
#ifdef _IN_SPU
\r
\r
// will be included from spu.c
\r
#ifdef _IN_SPU
\r
\r
-////////////////////////////////////////////////////////////////////////
\r
-// globals
\r
-////////////////////////////////////////////////////////////////////////
\r
-
\r
-// REVERB info and timing vars...
\r
-
\r
-int * sRVBPlay = 0;
\r
-int * sRVBEnd = 0;
\r
-int * sRVBStart = 0;
\r
-
\r
////////////////////////////////////////////////////////////////////////
\r
// START REVERB
\r
////////////////////////////////////////////////////////////////////////
\r
\r
INLINE void StartREVERB(int ch)
\r
{
\r
////////////////////////////////////////////////////////////////////////
\r
// START REVERB
\r
////////////////////////////////////////////////////////////////////////
\r
\r
INLINE void StartREVERB(int ch)
\r
{
\r
- if(s_chan[ch].bReverb && (spu
Ctrl&0x80))
// reverb possible?
\r
+ if(s_chan[ch].bReverb && (spu
.spuCtrl&0x80))
// reverb possible?
\r
{
\r
{
\r
- s_chan[ch].bRVBActive=!!iUseReverb;
\r
+ s_chan[ch].bRVBActive=!!
spu_config.
iUseReverb;
\r
}
\r
else s_chan[ch].bRVBActive=0; // else -> no reverb
\r
}
\r
}
\r
else s_chan[ch].bRVBActive=0; // else -> no reverb
\r
}
\r
@@
-55,7
+45,7
@@
INLINE void StartREVERB(int ch)
\r
INLINE void InitREVERB(int ns_to)
\r
{
\r
\r
INLINE void InitREVERB(int ns_to)
\r
{
\r
- memset(s
RVBStart,0,ns_to*sizeof(
sRVBStart[0])*2);
\r
+ memset(s
pu.sRVBStart,0,ns_to*sizeof(spu.
sRVBStart[0])*2);
\r
}
\r
\r
////////////////////////////////////////////////////////////////////////
\r
}
\r
\r
////////////////////////////////////////////////////////////////////////
\r
@@
-69,16
+59,16
@@
INLINE int rvb2ram_offs(int curr, int space, int iOff)
\r
// get_buffer content helper: takes care about wraps
\r
#define g_buffer(var) \
\r
\r
// get_buffer content helper: takes care about wraps
\r
#define g_buffer(var) \
\r
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
\r
+ ((int)(signed short)spu
.spu
Mem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
\r
\r
// saturate iVal and store it as var
\r
#define s_buffer(var, iVal) \
\r
ssat32_to_16(iVal); \
\r
\r
// saturate iVal and store it as var
\r
#define s_buffer(var, iVal) \
\r
ssat32_to_16(iVal); \
\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
\r
+ spu
.spu
Mem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
\r
\r
#define s_buffer1(var, iVal) \
\r
ssat32_to_16(iVal); \
\r
\r
#define s_buffer1(var, iVal) \
\r
ssat32_to_16(iVal); \
\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
\r
+ spu
.spu
Mem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
@@
-97,8
+87,8
@@
static void MixREVERB(int ns_to)
int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;
\r
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;
\r
\r
int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;
\r
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;
\r
\r
- int input_L = sRVBStart[ns] * rvb.IN_COEF_L;
\r
- int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;
\r
+ int input_L = s
pu.s
RVBStart[ns] * rvb.IN_COEF_L;
\r
+ int input_R = s
pu.s
RVBStart[ns+1] * rvb.IN_COEF_R;
\r
\r
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;
\r
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;
\r
\r
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;
\r
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;
\r
@@
-254,7
+244,7
@@
INLINE void REVERBDo(int ns_to)
return;
\r
}
\r
\r
return;
\r
}
\r
\r
- if (spu
Ctrl & 0x80)
// -> reverb on? oki
\r
+ if (spu
.spuCtrl & 0x80)
// -> reverb on? oki
\r
{
\r
if (unlikely(rvb.dirty))
\r
prepare_offsets();
\r
{
\r
if (unlikely(rvb.dirty))
\r
prepare_offsets();
\r