diff options
Diffstat (limited to 'Alc/effects')
| -rw-r--r-- | Alc/effects/compressor.c | 10 | ||||
| -rw-r--r-- | Alc/effects/equalizer.c | 7 | ||||
| -rw-r--r-- | Alc/effects/modulator.c | 11 |
3 files changed, 12 insertions, 16 deletions
diff --git a/Alc/effects/compressor.c b/Alc/effects/compressor.c index 6358f672..4e1d55f1 100644 --- a/Alc/effects/compressor.c +++ b/Alc/effects/compressor.c @@ -58,17 +58,15 @@ static ALboolean ALcompressorState_deviceUpdate(ALcompressorState *state, ALCdev static ALvoid ALcompressorState_update(ALcompressorState *state, const ALCdevice *device, const ALeffectslot *slot) { aluMatrixf matrix; - ALfloat scale; ALuint i; state->Enabled = slot->EffectProps.Compressor.OnOff; - scale = device->Dry.AmbiScale; aluMatrixfSet(&matrix, - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, scale, 0.0f, 0.0f, - 0.0f, 0.0f, scale, 0.0f, - 0.0f, 0.0f, 0.0f, scale + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f ); STATIC_CAST(ALeffectState,state)->OutBuffer = device->FOAOut.Buffer; diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c index ffc9830f..f3383bd2 100644 --- a/Alc/effects/equalizer.c +++ b/Alc/effects/equalizer.c @@ -103,12 +103,11 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCdevice * aluMatrixf matrix; ALuint i; - gain = device->Dry.AmbiScale; aluMatrixfSet(&matrix, 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, gain, 0.0f, 0.0f, - 0.0f, 0.0f, gain, 0.0f, - 0.0f, 0.0f, 0.0f, gain + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f ); STATIC_CAST(ALeffectState,state)->OutBuffer = device->FOAOut.Buffer; diff --git a/Alc/effects/modulator.c b/Alc/effects/modulator.c index c283d4b0..03e0d458 100644 --- a/Alc/effects/modulator.c +++ b/Alc/effects/modulator.c @@ -93,8 +93,8 @@ static ALboolean ALmodulatorState_deviceUpdate(ALmodulatorState *UNUSED(state), static ALvoid ALmodulatorState_update(ALmodulatorState *state, const ALCdevice *Device, const ALeffectslot *Slot) { - ALfloat scale, cw, a; aluMatrixf matrix; + ALfloat cw, a; ALuint i; if(Slot->EffectProps.Modulator.Waveform == AL_RING_MODULATOR_SINUSOID) @@ -122,12 +122,11 @@ static ALvoid ALmodulatorState_update(ALmodulatorState *state, const ALCdevice * state->Filter[i].process = ALfilterState_processC; } - scale = Device->Dry.AmbiScale; aluMatrixfSet(&matrix, - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, scale, 0.0f, 0.0f, - 0.0f, 0.0f, scale, 0.0f, - 0.0f, 0.0f, 0.0f, scale + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f ); STATIC_CAST(ALeffectState,state)->OutBuffer = Device->FOAOut.Buffer; |