diff options
author | Damien Zammit <damien@zamaudio.com> | 2018-12-30 16:12:44 +1100 |
---|---|---|
committer | Damien Zammit <damien@zamaudio.com> | 2018-12-30 16:12:44 +1100 |
commit | 013eea846d1ad227795479ec75af49f652b998ec (patch) | |
tree | 2c2ec6d3f3ea74e19becdc03cce9526d7e41d9bc | |
parent | b610459686ec534292d98952649d6b1dc04db93f (diff) |
WOW!
-rw-r--r-- | plugins/ZamTube/ZamTubePlugin.cpp | 4 | ||||
-rw-r--r-- | plugins/ZamTube/wdfcircuits.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index 0016166..929aade 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -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 - 30.); - tubeout = 30.*ckt.advanc(ViE) * from_dB(60. - tubedrive); + double ViE = in*from_dB(tubedrive); + tubeout = 30.*ckt.advanc(ViE) * from_dB(30. - tubedrive); if (!ckt.on) { tubeout = 0.0; } else { diff --git a/plugins/ZamTube/wdfcircuits.h b/plugins/ZamTube/wdfcircuits.h index a30d34c..b7764c9 100644 --- a/plugins/ZamTube/wdfcircuits.h +++ b/plugins/ZamTube/wdfcircuits.h @@ -76,12 +76,12 @@ public: Real Ckb = Cka; Real I3_3b3 = I3_3Gamma1 * Ckb; Real Cib = Cia; - Real S0_3b3 = Cib + ViE; - Real P0_3b3 = -S0_3b3 + P0_3Gamma1*(-S0_3b3); + Real S0_3b3 = ViE + S0_3Gamma1*(Cib); + Real P0_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 = 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,13 +89,13 @@ public: Real b2 = t.getG(); Real b3 = t.getP(); //Set As - Real I3_3b1 = (b1 - I3_3Gamma1*(Ckb)); + Real I3_3b1 = (b1 - I3_3Gamma1*(b1 + 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 S0_3b1 = (Cib + ViE - P0_3b1 - S0_3Gamma1*(Cib + ViE - P0_3b1)); + Real S1_3b2 = P0_3b3 - b2 - S1_3Gamma1*(P0_3b3 - b2); + Real P0_3b1 = S1_3b2 + (-S0_3b3) - P0_3Gamma1*(S1_3b2 - S0_3b3); + Real S0_3b1 = (-P0_3b1 - S0_3Gamma1*(Cib - P0_3b1)); Cia = S0_3b1; - Real P2_3b1 = (E250E - P2_3Gamma1*(b3 - S2_3b3)); + Real P2_3b1 = (b3 - S2_3b3 - P2_3Gamma1*(b3 - S2_3b3)); Real S2_3b1 = (Cob - S2_3Gamma1*(Cob - P2_3b1)); Coa = S2_3b1; Real S2_3b2 = (Cob - P2_3b1 - S2_3Gamma1*(Cob - P2_3b1)); |