brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Host Audio 2: Fix level meter if graphics update faster than audio

Browse source
This commit is contained in:
falkTX 2022-02-02 01:31:56 +00:00
parent c6a5c2e72e
commit 1d7c599897
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/Cardinal/src/HostAudio.cpp
View file

@ -244,6 +244,7 @@ struct HostAudio : Module {
// for rack core audio module compatibility // for rack core audio module compatibility
dsp::RCFilter dcFilters[numIO]; dsp::RCFilter dcFilters[numIO];
bool dcFilterEnabled = (numIO == 2); bool dcFilterEnabled = (numIO == 2);
volatile bool resetMeters = true;
float gainMeterL = 0.0f; float gainMeterL = 0.0f;
float gainMeterR = 0.0f; float gainMeterR = 0.0f;
@ -269,10 +270,13 @@ struct HostAudio : Module {
void onReset() override void onReset() override
{ {
dcFilterEnabled = (numIO == 2); dcFilterEnabled = (numIO == 2);
resetMeters = true;
} }
void onSampleRateChange(const SampleRateChangeEvent& e) override void onSampleRateChange(const SampleRateChangeEvent& e) override
{ {
resetMeters = true;
for (int i=0; i<numIO; ++i) for (int i=0; i<numIO; ++i)
dcFilters[i].setCutoffFreq(10.f * e.sampleTime); dcFilters[i].setCutoffFreq(10.f * e.sampleTime);
} }
@ -327,12 +331,17 @@ struct HostAudio : Module {
if (dataFrame == blockFrames) if (dataFrame == blockFrames)
{ {
if (resetMeters)
gainMeterL = gainMeterR = 0.0f;
gainMeterL = std::max(gainMeterL, d_findMaxNormalizedFloat(dataOuts[0], blockFrames)); gainMeterL = std::max(gainMeterL, d_findMaxNormalizedFloat(dataOuts[0], blockFrames));
if (connected) if (connected)
gainMeterR = std::max(gainMeterR, d_findMaxNormalizedFloat(dataOuts[1], blockFrames)); gainMeterR = std::max(gainMeterR, d_findMaxNormalizedFloat(dataOuts[1], blockFrames));
else else
gainMeterR = gainMeterL; gainMeterR = gainMeterL;
resetMeters = false;
} }
} }
} }
@ -358,6 +367,8 @@ struct HostAudio : Module {
template<int numIO> template<int numIO>
struct NanoMeter : Widget { struct NanoMeter : Widget {
HostAudio<numIO>* const module; HostAudio<numIO>* const module;
float gainMeterL = 0.0f;
float gainMeterR = 0.0f;
NanoMeter(HostAudio<numIO>* const m) NanoMeter(HostAudio<numIO>* const m)
: module(m) : module(m)
@ -387,10 +398,13 @@ struct NanoMeter : Widget {
if (module != nullptr) if (module != nullptr)
{ {
float gainMeterL = 0.0f; // Only fetch new values once DSP side is updated
float gainMeterR = 0.0f; if (! module->resetMeters)
std::swap(gainMeterL, module->gainMeterL); {
std::swap(gainMeterR, module->gainMeterR); gainMeterL = module->gainMeterL;
gainMeterR = module->gainMeterR;
module->resetMeters = true;
}
const float heightL = 1.0f + std::sqrt(gainMeterL) * (usableHeight - 1.0f); const float heightL = 1.0f + std::sqrt(gainMeterL) * (usableHeight - 1.0f);
nvgBeginPath(args.vg); nvgBeginPath(args.vg);