summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-09-25 15:56:28 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-09-25 16:07:22 +0200
commitaa57ad1bcfc42b7890a31c434762103ffc0b4198 (patch)
tree474cf3304f64e11923492ee96b120b49e72c874b
parentaebd574804f8cc327a84f7baabb01a048070fdd8 (diff)
effects/builtin/loudnesscontoureffect: Use CSAMPLE_GAIN for gain
-rw-r--r--src/effects/builtin/loudnesscontoureffect.cpp7
-rw-r--r--src/effects/builtin/loudnesscontoureffect.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/builtin/loudnesscontoureffect.cpp b/src/effects/builtin/loudnesscontoureffect.cpp
index fd1781f73b..5f9bea97e8 100644
--- a/src/effects/builtin/loudnesscontoureffect.cpp
+++ b/src/effects/builtin/loudnesscontoureffect.cpp
@@ -68,11 +68,10 @@ LoudnessContourEffectGroupState::LoudnessContourEffectGroupState(
: EffectState(bufferParameters),
m_oldGainKnob(1.0),
m_oldLoudness(0.0),
- m_oldGain(1.0),
+ m_oldGain(1.0f),
m_oldFilterGainDb(0),
m_oldUseGain(false),
m_oldSampleRate(bufferParameters.sampleRate()) {
-
m_pBuf = SampleUtil::alloc(bufferParameters.samplesPerBuffer());
// Initialize the filters with default parameters
@@ -115,7 +114,7 @@ void LoudnessContourEffect::processChannel(
Q_UNUSED(groupFeatures);
double filterGainDb = pState->m_oldFilterGainDb;
- double gain = pState->m_oldGain;
+ auto gain = static_cast<CSAMPLE_GAIN>(pState->m_oldGain);
if (enableState != EffectEnableState::Disabling) {
@@ -144,7 +143,7 @@ void LoudnessContourEffect::processChannel(
else {
filterGainDb = -loudness;
// compensate filter boost to avoid clipping
- gain = db2ratio(-filterGainDb);
+ gain = static_cast<CSAMPLE_GAIN>(db2ratio(-filterGainDb));
}
pState->setFilters(bufferParameters.sampleRate(), filterGainDb);
}
diff --git a/src/effects/builtin/loudnesscontoureffect.h b/src/effects/builtin/loudnesscontoureffect.h
index 158b5af79a..8877dcb58d 100644
--- a/src/effects/builtin/loudnesscontoureffect.h
+++ b/src/effects/builtin/loudnesscontoureffect.h
@@ -25,7 +25,7 @@ class LoudnessContourEffectGroupState final : public EffectState {
CSAMPLE* m_pBuf;
double m_oldGainKnob;
double m_oldLoudness;
- double m_oldGain;
+ CSAMPLE_GAIN m_oldGain;
double m_oldFilterGainDb;
bool m_oldUseGain;
unsigned int m_oldSampleRate;