From 55ec97408315265c1c350243b316624571e7b43d Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sun, 10 May 2020 08:59:01 +1000 Subject: Fix narrowing of double to float math --- plugins/ZaMaximX2/ZaMaximX2Plugin.hpp | 4 ++-- plugins/ZaMultiComp/ZaMultiCompPlugin.hpp | 4 ++-- plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp | 4 ++-- plugins/ZamChild670/ZamChild670Plugin.hpp | 4 ++-- plugins/ZamComp/ZamCompPlugin.hpp | 4 ++-- plugins/ZamCompX2/ZamCompX2Plugin.hpp | 4 ++-- plugins/ZamDelay/ZamDelayPlugin.hpp | 4 ++-- plugins/ZamDynamicEQ/ZamDynamicEQPlugin.hpp | 4 ++-- plugins/ZamEQ2/ZamEQ2Plugin.hpp | 4 ++-- plugins/ZamGEQ31/ZamGEQ31Plugin.hpp | 4 ++-- plugins/ZamGate/ZamGatePlugin.hpp | 4 ++-- plugins/ZamGateX2/ZamGateX2Plugin.hpp | 4 ++-- plugins/ZamGrains/ZamGrainsPlugin.hpp | 4 ++-- plugins/ZamHeadX2/ZamHeadX2Plugin.hpp | 4 ++-- plugins/ZamPhono/ZamPhonoPlugin.hpp | 4 ++-- plugins/ZamPiano/ZamPianoPlugin.hpp | 4 ++-- plugins/ZamSFZ/ZamSFZPlugin.hpp | 4 ++-- plugins/ZamSynth/ZamSynthPlugin.hpp | 4 ++-- plugins/ZamTube/ZamTubePlugin.hpp | 4 ++-- plugins/ZamVerb/ZamVerbPlugin.cpp | 7 ++++--- plugins/ZamVerb/ZamVerbPlugin.hpp | 4 ++-- 21 files changed, 44 insertions(+), 43 deletions(-) diff --git a/plugins/ZaMaximX2/ZaMaximX2Plugin.hpp b/plugins/ZaMaximX2/ZaMaximX2Plugin.hpp index a9abca6..a8b3828 100644 --- a/plugins/ZaMaximX2/ZaMaximX2Plugin.hpp +++ b/plugins/ZaMaximX2/ZaMaximX2Plugin.hpp @@ -104,12 +104,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp b/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp index 68b8332..2d670c2 100644 --- a/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp +++ b/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp @@ -152,12 +152,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void run_comp(int k, float in, float *out); diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp index 5f3532c..bb00328 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp @@ -154,12 +154,12 @@ Stereo version of ZaMultiComp, with individual threshold controls for each band static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void run_comp(int k, float inL, float inR, float *outL, float *outR); diff --git a/plugins/ZamChild670/ZamChild670Plugin.hpp b/plugins/ZamChild670/ZamChild670Plugin.hpp index 940bdca..8d838ef 100644 --- a/plugins/ZamChild670/ZamChild670Plugin.hpp +++ b/plugins/ZamChild670/ZamChild670Plugin.hpp @@ -105,12 +105,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamComp/ZamCompPlugin.hpp b/plugins/ZamComp/ZamCompPlugin.hpp index 999816a..1cc6e84 100644 --- a/plugins/ZamComp/ZamCompPlugin.hpp +++ b/plugins/ZamComp/ZamCompPlugin.hpp @@ -106,12 +106,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.hpp b/plugins/ZamCompX2/ZamCompX2Plugin.hpp index 7ba3b0b..e70c68e 100644 --- a/plugins/ZamCompX2/ZamCompX2Plugin.hpp +++ b/plugins/ZamCompX2/ZamCompX2Plugin.hpp @@ -112,12 +112,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamDelay/ZamDelayPlugin.hpp b/plugins/ZamDelay/ZamDelayPlugin.hpp index 6ea8505..8fdf7fd 100644 --- a/plugins/ZamDelay/ZamDelayPlugin.hpp +++ b/plugins/ZamDelay/ZamDelayPlugin.hpp @@ -111,12 +111,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.hpp b/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.hpp index 2793f75..28d180b 100644 --- a/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.hpp +++ b/plugins/ZamDynamicEQ/ZamDynamicEQPlugin.hpp @@ -115,12 +115,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void peq(double G0, double G, double GB, double w0, double Dw, diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.hpp b/plugins/ZamEQ2/ZamEQ2Plugin.hpp index 127de7e..678a5c0 100644 --- a/plugins/ZamEQ2/ZamEQ2Plugin.hpp +++ b/plugins/ZamEQ2/ZamEQ2Plugin.hpp @@ -108,12 +108,12 @@ protected: static inline double from_dB(double gdb) { - return (exp(gdb/20.f*log(10.f))); + return (exp(0.05*gdb*log(10.0))); } static inline double to_dB(double g) { - return (20.f*log10(g)); + return (20.0*log10(g)); } static inline int diff --git a/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp b/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp index 4058c4c..7cd5c10 100644 --- a/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp +++ b/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp @@ -128,12 +128,12 @@ protected: static inline double from_dB(double gdb) { - return (exp(gdb/20.f*log(10.f))); + return (exp(0.05*gdb*log(10.0))); } static inline double to_dB(double g) { - return (20.f*log10(g)); + return (20.0*log10(g)); } static inline int diff --git a/plugins/ZamGate/ZamGatePlugin.hpp b/plugins/ZamGate/ZamGatePlugin.hpp index 71d5078..c479218 100644 --- a/plugins/ZamGate/ZamGatePlugin.hpp +++ b/plugins/ZamGate/ZamGatePlugin.hpp @@ -110,12 +110,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } // ------------------------------------------------------------------- diff --git a/plugins/ZamGateX2/ZamGateX2Plugin.hpp b/plugins/ZamGateX2/ZamGateX2Plugin.hpp index 3407f54..19ab797 100644 --- a/plugins/ZamGateX2/ZamGateX2Plugin.hpp +++ b/plugins/ZamGateX2/ZamGateX2Plugin.hpp @@ -110,12 +110,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } // ------------------------------------------------------------------- diff --git a/plugins/ZamGrains/ZamGrainsPlugin.hpp b/plugins/ZamGrains/ZamGrainsPlugin.hpp index 7d44999..b3e89c4 100644 --- a/plugins/ZamGrains/ZamGrainsPlugin.hpp +++ b/plugins/ZamGrains/ZamGrainsPlugin.hpp @@ -108,12 +108,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamHeadX2/ZamHeadX2Plugin.hpp b/plugins/ZamHeadX2/ZamHeadX2Plugin.hpp index 626ce30..608e21a 100644 --- a/plugins/ZamHeadX2/ZamHeadX2Plugin.hpp +++ b/plugins/ZamHeadX2/ZamHeadX2Plugin.hpp @@ -105,12 +105,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamPhono/ZamPhonoPlugin.hpp b/plugins/ZamPhono/ZamPhonoPlugin.hpp index 194d784..77d581c 100644 --- a/plugins/ZamPhono/ZamPhonoPlugin.hpp +++ b/plugins/ZamPhono/ZamPhonoPlugin.hpp @@ -90,12 +90,12 @@ protected: static inline double from_dB(double gdb) { - return (exp(gdb/20.f*log(10.f))); + return (exp(0.05*gdb*log(10.0))); } static inline double to_dB(double g) { - return (20.f*log10(g)); + return (20.0*log10(g)); } void activate() override; diff --git a/plugins/ZamPiano/ZamPianoPlugin.hpp b/plugins/ZamPiano/ZamPianoPlugin.hpp index 9d3c36a..9e161bc 100644 --- a/plugins/ZamPiano/ZamPianoPlugin.hpp +++ b/plugins/ZamPiano/ZamPianoPlugin.hpp @@ -120,12 +120,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamSFZ/ZamSFZPlugin.hpp b/plugins/ZamSFZ/ZamSFZPlugin.hpp index 12b74ed..0c7b68b 100644 --- a/plugins/ZamSFZ/ZamSFZPlugin.hpp +++ b/plugins/ZamSFZ/ZamSFZPlugin.hpp @@ -108,12 +108,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } float wavetable(int i, int note); diff --git a/plugins/ZamSynth/ZamSynthPlugin.hpp b/plugins/ZamSynth/ZamSynthPlugin.hpp index c52fb11..977d1eb 100644 --- a/plugins/ZamSynth/ZamSynthPlugin.hpp +++ b/plugins/ZamSynth/ZamSynthPlugin.hpp @@ -103,12 +103,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } float wavetable(float in); diff --git a/plugins/ZamTube/ZamTubePlugin.hpp b/plugins/ZamTube/ZamTubePlugin.hpp index 8411481..908fa0b 100644 --- a/plugins/ZamTube/ZamTubePlugin.hpp +++ b/plugins/ZamTube/ZamTubePlugin.hpp @@ -142,12 +142,12 @@ Wave digital filter physical model of a triode tube amplifier stage, with modell static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; diff --git a/plugins/ZamVerb/ZamVerbPlugin.cpp b/plugins/ZamVerb/ZamVerbPlugin.cpp index 0dcb1e6..906bc9d 100644 --- a/plugins/ZamVerb/ZamVerbPlugin.cpp +++ b/plugins/ZamVerb/ZamVerbPlugin.cpp @@ -205,6 +205,7 @@ void ZamVerbPlugin::run(const float** inputs, float** outputs, uint32_t frames) uint32_t i; int nprocessed; active = swap; + float _wetdry = 0.01f * wetdry; if (!signal) { memcpy(outputs[0], inputs[0], frames * sizeof(float)); @@ -215,14 +216,14 @@ void ZamVerbPlugin::run(const float** inputs, float** outputs, uint32_t frames) assert(frames < 8192); memcpy(tmpins[0], inputs[0], frames * sizeof(float)); memcpy(tmpins[1], inputs[1], frames * sizeof(float)); - nprocessed = clv[active]->clv_convolve(tmpins, tmpouts, 2, 2, frames, from_dB(-16.)); + nprocessed = clv[active]->clv_convolve(tmpins, tmpouts, 2, 2, frames, from_dB(-16.f)); if (nprocessed <= 0) { memcpy(outputs[0], inputs[0], frames * sizeof(float)); memcpy(outputs[1], inputs[1], frames * sizeof(float)); } else { for (i = 0; i < frames; i++) { - outputs[0][i] = (wetdry / 100. * tmpouts[0][i] + (1.f - wetdry / 100.) * inputs[0][i]) * from_dB(master); - outputs[1][i] = (wetdry / 100. * tmpouts[1][i] + (1.f - wetdry / 100.) * inputs[1][i]) * from_dB(master); + outputs[0][i] = (_wetdry * tmpouts[0][i] + (1.f - _wetdry) * inputs[0][i]) * from_dB(master); + outputs[1][i] = (_wetdry * tmpouts[1][i] + (1.f - _wetdry) * inputs[1][i]) * from_dB(master); } } } diff --git a/plugins/ZamVerb/ZamVerbPlugin.hpp b/plugins/ZamVerb/ZamVerbPlugin.hpp index 28f08c8..e921443 100644 --- a/plugins/ZamVerb/ZamVerbPlugin.hpp +++ b/plugins/ZamVerb/ZamVerbPlugin.hpp @@ -103,12 +103,12 @@ protected: static inline float from_dB(float gdb) { - return (exp(gdb/20.f*log(10.f))); + return (expf(0.05f*gdb*logf(10.f))); } static inline float to_dB(float g) { - return (20.f*log10(g)); + return (20.f*log10f(g)); } void activate() override; -- cgit v1.2.3