kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use constexpr variables instead of macros

Browse Source
This commit is contained in:
Chris Robinson 2020-12-06 08:49:20 -08:00
parent 4ee95dc296
commit bd08b9a5b5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
alc/effects/autowah.cpp
View File

@ -25,18 +25,18 @@
#include <algorithm> #include <algorithm>
#include "al/auxeffectslot.h"
#include "alcmain.h" #include "alcmain.h"
#include "alcontext.h" #include "alcontext.h"
#include "alu.h"
#include "core/filters/biquad.h" #include "core/filters/biquad.h"
#include "effectslot.h"
#include "vecmat.h" #include "vecmat.h"
namespace { namespace {
#define MIN_FREQ 20.0f constexpr float GainScale{31621.0f};
#define MAX_FREQ 2500.0f constexpr float MinFreq{20.0f};
#define Q_FACTOR 5.0f constexpr float MaxFreq{2500.0f};
constexpr float QFactor{5.0f};
struct AutowahState final : public EffectState { struct AutowahState final : public EffectState {
/* Effect parameters */ /* Effect parameters */
@ -116,9 +116,9 @@ void AutowahState::update(const ALCcontext *context, const EffectSlot *slot,
mReleaseRate = std::exp(-1.0f / (ReleaseTime*frequency)); mReleaseRate = std::exp(-1.0f / (ReleaseTime*frequency));
/* 0-20dB Resonance Peak gain */ /* 0-20dB Resonance Peak gain */
mResonanceGain = std::sqrt(std::log10(props->Autowah.Resonance)*10.0f / 3.0f); mResonanceGain = std::sqrt(std::log10(props->Autowah.Resonance)*10.0f / 3.0f);
mPeakGain = 1.0f - std::log10(props->Autowah.PeakGain/AL_AUTOWAH_MAX_PEAK_GAIN); mPeakGain = 1.0f - std::log10(props->Autowah.PeakGain / GainScale);
mFreqMinNorm = MIN_FREQ / frequency; mFreqMinNorm = MinFreq / frequency;
mBandwidthNorm = (MAX_FREQ-MIN_FREQ) / frequency; mBandwidthNorm = (MaxFreq-MinFreq) / frequency;
mOutTarget = target.Main->Buffer; mOutTarget = target.Main->Buffer;
auto set_gains = [slot,target](auto &chan, al::span<const float,MaxAmbiChannels> coeffs) auto set_gains = [slot,target](auto &chan, al::span<const float,MaxAmbiChannels> coeffs)
@ -151,7 +151,7 @@ void AutowahState::process(const size_t samplesToDo,
/* Calculate the cos and alpha components for this sample's filter. */ /* Calculate the cos and alpha components for this sample's filter. */
w0 = minf((bandwidth*env_delay + freq_min), 0.46f) * al::MathDefs<float>::Tau(); w0 = minf((bandwidth*env_delay + freq_min), 0.46f) * al::MathDefs<float>::Tau();
mEnv[i].cos_w0 = std::cos(w0); mEnv[i].cos_w0 = std::cos(w0);
mEnv[i].alpha = std::sin(w0)/(2.0f * Q_FACTOR); mEnv[i].alpha = std::sin(w0)/(2.0f * QFactor);
} }
mEnvDelay = env_delay; mEnvDelay = env_delay;