diff options
| author | Chris Robinson <[email protected]> | 2019-02-21 03:52:54 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-02-21 03:52:54 -0800 |
| commit | 8d2d7c63da8f5f106f607f5b21ea08151217c58a (patch) | |
| tree | ff5e35dff1279614ba9211f1381f47b789d42a3e /Alc/effects/compressor.cpp | |
| parent | 462e320847de3937a5b40a4ed22e3bd745360410 (diff) | |
Get rid of the MAX_EFFECT_CHANNELS macro
Diffstat (limited to 'Alc/effects/compressor.cpp')
| -rw-r--r-- | Alc/effects/compressor.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Alc/effects/compressor.cpp b/Alc/effects/compressor.cpp index 23069dd7..99507661 100644 --- a/Alc/effects/compressor.cpp +++ b/Alc/effects/compressor.cpp @@ -39,7 +39,7 @@ struct ALcompressorState final : public EffectState { /* Effect gains for each channel */ - ALfloat mGain[MAX_EFFECT_CHANNELS][MAX_OUTPUT_CHANNELS]{}; + ALfloat mGain[MAX_AMBI_CHANNELS][MAX_OUTPUT_CHANNELS]{}; /* Effect parameters */ ALboolean mEnabled{AL_TRUE}; @@ -66,8 +66,8 @@ ALboolean ALcompressorState::deviceUpdate(const ALCdevice *device) /* Calculate per-sample multipliers to attack and release at the desired * rates. */ - mAttackMult = powf(AMP_ENVELOPE_MAX/AMP_ENVELOPE_MIN, 1.0f/attackCount); - mReleaseMult = powf(AMP_ENVELOPE_MIN/AMP_ENVELOPE_MAX, 1.0f/releaseCount); + mAttackMult = std::pow(AMP_ENVELOPE_MAX/AMP_ENVELOPE_MIN, 1.0f/attackCount); + mReleaseMult = std::pow(AMP_ENVELOPE_MIN/AMP_ENVELOPE_MAX, 1.0f/releaseCount); return AL_TRUE; } @@ -78,9 +78,11 @@ void ALcompressorState::update(const ALCcontext* UNUSED(context), const ALeffect mOutBuffer = target.FOAOut->Buffer; mOutChannels = target.FOAOut->NumChannels; - for(ALsizei i{0};i < 4;i++) - ComputePanGains(target.FOAOut, alu::Matrix::Identity()[i].data(), - slot->Params.Gain, mGain[i]); + for(size_t i{0u};i < slot->WetBuffer.size();++i) + { + auto coeffs = GetAmbiIdentityRow(i); + ComputePanGains(target.FOAOut, coeffs.data(), slot->Params.Gain, mGain[i]); + } } void ALcompressorState::process(ALsizei samplesToDo, const ALfloat (*RESTRICT samplesIn)[BUFFERSIZE], const ALsizei numInput, ALfloat (*RESTRICT samplesOut)[BUFFERSIZE], const ALsizei numOutput) |