From 7f0ab88c2687cb01620dc62820581770d010b817 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sun, 30 Dec 2018 15:03:15 +1100 Subject: WTF supertube --- plugins/ZamTube/ZamTubePlugin.cpp | 1 + plugins/ZamTube/wdfcircuits.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index 0016166..eab5d36 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -952,6 +952,7 @@ void ZamTubePlugin::run(const float** inputs, float** outputs, uint32_t frames) double ViE = in*from_dB(tubedrive - 30.); tubeout = 30.*ckt.advanc(ViE) * from_dB(60. - tubedrive); + if (!ckt.on) { tubeout = 0.0; } else { diff --git a/plugins/ZamTube/wdfcircuits.h b/plugins/ZamTube/wdfcircuits.h index 34031dd..e3c890b 100644 --- a/plugins/ZamTube/wdfcircuits.h +++ b/plugins/ZamTube/wdfcircuits.h @@ -77,11 +77,11 @@ public: Real I3_3b3 = I3_3Gamma1 * Ckb; Real Cib = Cia; Real S0_3b3 = Cib + ViE; - Real P0_3b3 = -S0_3b3 + P0_3Gamma1*(-S0_3b3); + Real P0_3b3 = /*-S0_3b3 +*/ P0_3Gamma1*(-S0_3b3); Real S1_3b3 = P0_3b3 + S1_3Gamma1*(P0_3b3); Real Cob = Coa; Real S2_3b3 = Cob; - Real P2_3b3 = -S2_3b3 + E250E + P2_3Gamma1*(-S2_3b3); + Real P2_3b3 = /*-S2_3b3 +*/ E250E + P2_3Gamma1*(-S2_3b3); //Tube: K G P //printf("K=%f G=%f P=%f\n", I3_3b3,-S1_3b3,P2_3b3); t.compute(I3_3b3,-S1_3b3,P2_3b3); @@ -89,10 +89,10 @@ public: Real b2 = t.getG(); Real b3 = t.getP(); //Set As - Real I3_3b1 = (b1 - I3_3Gamma1*(Ckb)); + Real I3_3b1 = b1 + /**/Ckb ;//- I3_3Gamma1*(Ckb); Cka = I3_3b1; - Real S1_3b2 = ((-b2) + P0_3b3 - S1_3Gamma1*(P0_3b3) - b2); - Real P0_3b1 = (S1_3b2 + (-S0_3b3) - P0_3Gamma1*(S1_3b2 - S0_3b3)); + Real S1_3b2 = (-b2) + P0_3b3 - S1_3Gamma1*(P0_3b3 - b2); + Real P0_3b1 = /*S1_3b2 + */(-S0_3b3) - P0_3Gamma1*(S1_3b2 - S0_3b3); Real S0_3b1 = (Cib + ViE - P0_3b1 - S0_3Gamma1*(Cib + ViE - P0_3b1)); Cia = S0_3b1; Real P2_3b1 = (E250E - P2_3Gamma1*(b3 - S2_3b3)); -- cgit v1.2.3