diff options
Diffstat (limited to 'plugins/dfsound/reverb.c')
| -rw-r--r-- | plugins/dfsound/reverb.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c index 0a94ff4..bb5ee8e 100644 --- a/plugins/dfsound/reverb.c +++ b/plugins/dfsound/reverb.c @@ -27,24 +27,14 @@ #ifdef _IN_SPU
////////////////////////////////////////////////////////////////////////
-// globals
-////////////////////////////////////////////////////////////////////////
-
-// REVERB info and timing vars...
-
-int * sRVBPlay = 0;
-int * sRVBEnd = 0;
-int * sRVBStart = 0;
-
-////////////////////////////////////////////////////////////////////////
// START REVERB
////////////////////////////////////////////////////////////////////////
INLINE void StartREVERB(int ch)
{
- if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?
+ if(s_chan[ch].bReverb && (spu.spuCtrl&0x80)) // reverb possible?
{
- s_chan[ch].bRVBActive=!!iUseReverb;
+ s_chan[ch].bRVBActive=!!spu_config.iUseReverb;
}
else s_chan[ch].bRVBActive=0; // else -> no reverb
}
@@ -55,7 +45,7 @@ INLINE void StartREVERB(int ch) INLINE void InitREVERB(int ns_to)
{
- memset(sRVBStart,0,ns_to*sizeof(sRVBStart[0])*2);
+ memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);
}
////////////////////////////////////////////////////////////////////////
@@ -69,16 +59,16 @@ INLINE int rvb2ram_offs(int curr, int space, int iOff) // get_buffer content helper: takes care about wraps
#define g_buffer(var) \
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
+ ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
// saturate iVal and store it as var
#define s_buffer(var, iVal) \
ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
#define s_buffer1(var, iVal) \
ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
////////////////////////////////////////////////////////////////////////
@@ -97,8 +87,8 @@ static void MixREVERB(int ns_to) int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;
- int input_L = sRVBStart[ns] * rvb.IN_COEF_L;
- int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;
+ int input_L = spu.sRVBStart[ns] * rvb.IN_COEF_L;
+ int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;
@@ -254,7 +244,7 @@ INLINE void REVERBDo(int ns_to) return;
}
- if (spuCtrl & 0x80) // -> reverb on? oki
+ if (spu.spuCtrl & 0x80) // -> reverb on? oki
{
if (unlikely(rvb.dirty))
prepare_offsets();
|