Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REFACTOR] Move tone stack params to OnParamChange() #443

Merged
merged 1 commit into from
Mar 10, 2024
Merged

[REFACTOR] Move tone stack params to OnParamChange() #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 40 additions & 24 deletions NeuralAmpModeler/NeuralAmpModeler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,30 +326,6 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp
sample** toneStackOutPointers = gateGainOutput;
if (toneStackActive)
{
// Translate params from knob 0-10 to dB.
// Tuned ranges based on my ear. E.g. seems treble doesn't need nearly as
// much swing as bass can use.
const double bassGainDB = 4.0 * (GetParam(kToneBass)->Value() - 5.0); // +/- 20
const double midGainDB = 3.0 * (GetParam(kToneMid)->Value() - 5.0); // +/- 15
const double trebleGainDB = 2.0 * (GetParam(kToneTreble)->Value() - 5.0); // +/- 10

const double bassFrequency = 150.0;
const double midFrequency = 425.0;
const double trebleFrequency = 1800.0;
const double bassQuality = 0.707;
// Wider EQ on mid bump up to sound less honky.
const double midQuality = midGainDB < 0.0 ? 1.5 : 0.7;
const double trebleQuality = 0.707;

// Define filter parameters
recursive_linear_filter::BiquadParams bassParams(sampleRate, bassFrequency, bassQuality, bassGainDB);
recursive_linear_filter::BiquadParams midParams(sampleRate, midFrequency, midQuality, midGainDB);
recursive_linear_filter::BiquadParams trebleParams(sampleRate, trebleFrequency, trebleQuality, trebleGainDB);
// Apply tone stack
// Set parameters
mToneBass.SetParams(bassParams);
mToneMid.SetParams(midParams);
mToneTreble.SetParams(trebleParams);
sample** bassPointers = mToneBass.Process(gateGainOutput, numChannelsInternal, numFrames);
sample** midPointers = mToneMid.Process(bassPointers, numChannelsInternal, numFrames);
sample** treblePointers = mToneTreble.Process(midPointers, numChannelsInternal, numFrames);
Expand Down Expand Up @@ -462,6 +438,46 @@ void NeuralAmpModeler::OnUIOpen()
mCheckSampleRateWarning = true;
}

void NeuralAmpModeler::OnParamChange(int paramIdx)
{
switch (paramIdx)
{
case kToneBass:
{
const double sampleRate = GetSampleRate();
const double bassGainDB = 4.0 * (GetParam(kToneBass)->Value() - 5.0); // +/- 20
const double bassFrequency = 150.0;
const double bassQuality = 0.707;
recursive_linear_filter::BiquadParams bassParams(sampleRate, bassFrequency, bassQuality, bassGainDB);
mToneBass.SetParams(bassParams);
}

break;
case kToneMid:
{
const double sampleRate = GetSampleRate();
const double midGainDB = 3.0 * (GetParam(kToneMid)->Value() - 5.0); // +/- 15
const double midFrequency = 425.0;
// Wider EQ on mid bump up to sound less honky.
const double midQuality = midGainDB < 0.0 ? 1.5 : 0.7;
recursive_linear_filter::BiquadParams midParams(sampleRate, midFrequency, midQuality, midGainDB);
mToneMid.SetParams(midParams);
}
break;
case kToneTreble:
{
const double sampleRate = GetSampleRate();
const double trebleGainDB = 2.0 * (GetParam(kToneTreble)->Value() - 5.0); // +/- 10
const double trebleFrequency = 1800.0;
const double trebleQuality = 0.707;
recursive_linear_filter::BiquadParams trebleParams(sampleRate, trebleFrequency, trebleQuality, trebleGainDB);
mToneTreble.SetParams(trebleParams);
}
break;
default: break;
}
}

void NeuralAmpModeler::OnParamChangeUI(int paramIdx, EParamSource source)
{
if (auto pGraphics = GetUI())
Expand Down
1 change: 1 addition & 0 deletions NeuralAmpModeler/NeuralAmpModeler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ class NeuralAmpModeler final : public iplug::Plugin
void OnUIOpen() override;
bool OnHostRequestingSupportedViewConfiguration(int width, int height) override { return true; }

void OnParamChange(int paramIdx) override;
void OnParamChangeUI(int paramIdx, iplug::EParamSource source) override;
bool OnMessage(int msgTag, int ctrlTag, int dataSize, const void* pData) override;

Expand Down
Loading