diff options
author | Damien Zammit <damien@zamaudio.com> | 2018-12-30 17:18:39 +1100 |
---|---|---|
committer | Damien Zammit <damien@zamaudio.com> | 2018-12-30 17:18:39 +1100 |
commit | 6dcb7ea5baeed7a4f0c1742ed9ebc0b6b7f02611 (patch) | |
tree | 2eface3d289cb03b405f46b7c5e9644cacadc069 | |
parent | 013eea846d1ad227795479ec75af49f652b998ec (diff) |
Tweak defaults
-rw-r--r-- | plugins/ZamTube/ZamTubePlugin.cpp | 22 | ||||
-rw-r--r-- | plugins/ZamTube/ZamTubeUI.cpp | 16 | ||||
-rw-r--r-- | plugins/ZamTube/wdfcircuits.h | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index 929aade..9d845ff 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -46,14 +46,14 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.unit = " "; parameter.ranges.def = 0.0f; parameter.ranges.min = 0.0f; - parameter.ranges.max = 30.0f; + parameter.ranges.max = 11.0f; break; case paramBass: parameter.hints = kParameterIsAutomable; parameter.name = "Bass"; parameter.symbol = "bass"; parameter.unit = " "; - parameter.ranges.def = 1.0f; + parameter.ranges.def = 5.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 10.0f; break; @@ -62,7 +62,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.name = "Mids"; parameter.symbol = "mids"; parameter.unit = " "; - parameter.ranges.def = 1.0f; + parameter.ranges.def = 5.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 10.0f; break; @@ -71,7 +71,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.name = "Treble"; parameter.symbol = "treb"; parameter.unit = " "; - parameter.ranges.def = 1.0f; + parameter.ranges.def = 5.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 10.0f; break; @@ -98,7 +98,7 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) parameter.name = "Quality Insane"; parameter.symbol = "insane"; parameter.unit = " "; - parameter.ranges.def = 0.0f; + parameter.ranges.def = 1.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 1.0f; break; @@ -181,12 +181,12 @@ void ZamTubePlugin::loadProgram(uint32_t index) /* Default parameter values */ tubedrive = 0.0f; - bass = 1.f; - middle = 1.f; - treble = 1.f; + bass = 5.f; + middle = 5.f; + treble = 5.f; tonestack = 0.0f; mastergain = 0.0f; - insane = 0.0f; + insane = 1.0f; /* Default variable values */ @@ -950,8 +950,8 @@ void ZamTubePlugin::run(const float** inputs, float** outputs, uint32_t frames) // protect against overflowing circuit in = fabs(in) < DANGER ? in : 0.f; - double ViE = in*from_dB(tubedrive); - tubeout = 30.*ckt.advanc(ViE) * from_dB(30. - tubedrive); + double ViE = in*from_dB(tubedrive - 10.); + tubeout = e * ckt.advanc(ViE) * from_dB(40. - tubedrive); if (!ckt.on) { tubeout = 0.0; } else { diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp index d5e9697..4b6de0c 100644 --- a/plugins/ZamTube/ZamTubeUI.cpp +++ b/plugins/ZamTube/ZamTubeUI.cpp @@ -49,7 +49,7 @@ ZamTubeUI::ZamTubeUI() // knobs fKnobTube = new ZamKnob(this, knobImage); fKnobTube->setAbsolutePos(177, 76); - fKnobTube->setRange(0.f, 30.0f); + fKnobTube->setRange(0.f, 11.0f); fKnobTube->setLabel(true); fKnobTube->setScrollStep(1.0f); fKnobTube->setDefault(0.0f); @@ -61,7 +61,7 @@ ZamTubeUI::ZamTubeUI() fKnobBass->setRange(0.f, 10.f); fKnobBass->setLabel(true); fKnobBass->setScrollStep(1.0f); - fKnobBass->setDefault(1.0f); + fKnobBass->setDefault(5.0f); fKnobBass->setRotationAngle(240); fKnobBass->setCallback(this); @@ -70,7 +70,7 @@ ZamTubeUI::ZamTubeUI() fKnobMids->setRange(0.f, 10.f); fKnobMids->setLabel(true); fKnobMids->setScrollStep(1.f); - fKnobMids->setDefault(1.f); + fKnobMids->setDefault(5.f); fKnobMids->setRotationAngle(240); fKnobMids->setCallback(this); @@ -79,7 +79,7 @@ ZamTubeUI::ZamTubeUI() fKnobTreb->setRange(0.f, 10.f); fKnobTreb->setLabel(true); fKnobTreb->setScrollStep(1.f); - fKnobTreb->setDefault(1.f); + fKnobTreb->setDefault(5.f); fKnobTreb->setRotationAngle(240); fKnobTreb->setCallback(this); @@ -151,11 +151,11 @@ void ZamTubeUI::programLoaded(uint32_t index) // Default values fKnobTube->setValue(0.0f); - fKnobBass->setValue(1.f); - fKnobMids->setValue(1.f); - fKnobTreb->setValue(1.f); + fKnobBass->setValue(5.f); + fKnobMids->setValue(5.f); + fKnobTreb->setValue(5.f); fKnobGain->setValue(0.0f); - fToggleInsane->setDown(false); + fToggleInsane->setDown(true); fSliderNotch->setValue(0.0f); } diff --git a/plugins/ZamTube/wdfcircuits.h b/plugins/ZamTube/wdfcircuits.h index b7764c9..58b4c9a 100644 --- a/plugins/ZamTube/wdfcircuits.h +++ b/plugins/ZamTube/wdfcircuits.h @@ -100,7 +100,7 @@ public: Coa = S2_3b1; Real S2_3b2 = (Cob - P2_3b1 - S2_3Gamma1*(Cob - P2_3b1)); Real Roa = S2_3b2; - return -Roa; + return Roa; } private: |