Level out gain a bit && calibrate gain knob in dB

2 files changed, 9 insertions, 10 deletions

diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp
index de69c2a..9125bfc 100644
--- a/plugins/ZamTube/ZamTubePlugin.cpp
+++ b/plugins/ZamTube/ZamTubePlugin.cpp
@@ -127,8 +127,8 @@ void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter)
         parameter.name       = "Output level";
         parameter.symbol     = "gain";
         parameter.unit       = " ";
-        parameter.ranges.def = 15.0f;
-        parameter.ranges.min = 0.0f;
+        parameter.ranges.def = 0.0f;
+        parameter.ranges.min = -30.0f;
         parameter.ranges.max = 30.0f;
         break;
     case paramInsane:
@@ -223,7 +223,7 @@ void ZamTubePlugin::loadProgram(uint32_t index)
     middle = 5.f;
     treble = 5.f;
     tonestack = 0.0f;
-    mastergain = 15.0f;
+    mastergain = 0.0f;
     insane = 0.0f;
     insaneold = 0.0f;
 
@@ -353,10 +353,9 @@ void ZamTubePlugin::run(const float** inputs, float** outputs, uint32_t frames)
 
 	float tubeout = 0.f;
 	
-	float cut = insane ? 0. : -15.;
-	float compensate = insane ? -15. : 0.;
-	float pregain = from_dB(tubedrive*3.6364 + cut);
-	float postgain = from_dB(compensate + mastergain + 36.*(1. - tubedrive/11.));
+	float cut = insane ? 0. : 15.;
+	float pregain = from_dB(tubedrive*3.6364 - cut);
+	float postgain = from_dB(mastergain + cut + 42. * (1. - log1p(tubedrive/11.)));
 
 	for (uint32_t i = 0; i < frames; ++i) {
 
diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp
index 2dfd013..e61f6f0 100644
--- a/plugins/ZamTube/ZamTubeUI.cpp
+++ b/plugins/ZamTube/ZamTubeUI.cpp
@@ -85,10 +85,10 @@ ZamTubeUI::ZamTubeUI()
 
     fKnobGain = new ZamKnob(this, knobImage);
     fKnobGain->setAbsolutePos(63, 231);
-    fKnobGain->setRange(0.f, 30.0f);
+    fKnobGain->setRange(-30.f, 30.0f);
     fKnobGain->setLabel(true);
     fKnobGain->setScrollStep(1.f);
-    fKnobGain->setDefault(15.0f);
+    fKnobGain->setDefault(0.0f);
     fKnobGain->setRotationAngle(240);
     fKnobGain->setCallback(this);
 
@@ -154,7 +154,7 @@ void ZamTubeUI::programLoaded(uint32_t index)
     fKnobBass->setValue(5.f);
     fKnobMids->setValue(5.f);
     fKnobTreb->setValue(5.f);
-    fKnobGain->setValue(15.0f);
+    fKnobGain->setValue(0.0f);
     fToggleInsane->setDown(false);
     fSliderNotch->setValue(0.0f);
 }