From 01ac9d63e8eef15ef708ed2db5c7f09ceeb436a2 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Fri, 7 Aug 2020 09:30:46 -0500 Subject: [PATCH] a-comp, a-exp: Tweak meter bar range for consistency with inline-ui --- libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in | 12 ++++++------ libs/plugins/a-comp.lv2/a-comp.c | 4 +++- libs/plugins/a-comp.lv2/a-comp.ttl.in | 12 ++++++------ libs/plugins/a-exp.lv2/a-exp#stereo.ttl.in | 12 ++++++------ libs/plugins/a-exp.lv2/a-exp.c | 6 ++++-- libs/plugins/a-exp.lv2/a-exp.ttl.in | 12 ++++++------ 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in b/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in index 7045098f70..84e91b62a2 100644 --- a/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in +++ b/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in @@ -104,9 +104,9 @@ unit:db-display lv2:index 7 ; lv2:name "Input Level" ; lv2:symbol "inlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [ @@ -114,9 +114,9 @@ unit:db-display lv2:index 8 ; lv2:name "Output Level" ; lv2:symbol "outlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [ diff --git a/libs/plugins/a-comp.lv2/a-comp.c b/libs/plugins/a-comp.lv2/a-comp.c index e27d17104c..d54547ab66 100644 --- a/libs/plugins/a-comp.lv2/a-comp.c +++ b/libs/plugins/a-comp.lv2/a-comp.c @@ -39,6 +39,8 @@ # define M_PI 3.14159265358979323846 #endif +#define MINUS_60 0.0001f + #ifdef COMPILER_MSVC #include #define isfinite_local(val) (bool)_finite((double)val) @@ -417,7 +419,7 @@ run(LV2_Handle instance, uint32_t n_samples) makeup_gain = makeup_target; } - *(acomp->outlevel) = (max_out < 0.0056f) ? -70.f : to_dB(max_out); + *(acomp->outlevel) = (max_out < MINUS_60) ? -60.f : to_dB(max_out); *(acomp->inlevel) = in_peak_db; acomp->makeup_gain = makeup_gain; diff --git a/libs/plugins/a-comp.lv2/a-comp.ttl.in b/libs/plugins/a-comp.lv2/a-comp.ttl.in index b38c91ce18..9312f8b019 100644 --- a/libs/plugins/a-comp.lv2/a-comp.ttl.in +++ b/libs/plugins/a-comp.lv2/a-comp.ttl.in @@ -104,9 +104,9 @@ unit:db-display lv2:index 7 ; lv2:name "Input Level" ; lv2:symbol "inlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [ @@ -114,9 +114,9 @@ unit:db-display lv2:index 8 ; lv2:name "Output Level" ; lv2:symbol "outlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [ diff --git a/libs/plugins/a-exp.lv2/a-exp#stereo.ttl.in b/libs/plugins/a-exp.lv2/a-exp#stereo.ttl.in index 27ba8258cb..c5d6f5f57c 100644 --- a/libs/plugins/a-exp.lv2/a-exp#stereo.ttl.in +++ b/libs/plugins/a-exp.lv2/a-exp#stereo.ttl.in @@ -97,9 +97,9 @@ lv2:index 7 ; lv2:name "Output Level" ; lv2:symbol "outlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db ; ] , [ @@ -107,9 +107,9 @@ lv2:index 8 ; lv2:name "Input Level" ; lv2:symbol "inlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db ; ] , [ diff --git a/libs/plugins/a-exp.lv2/a-exp.c b/libs/plugins/a-exp.lv2/a-exp.c index 7f13e1a2ff..b0bc4b97fc 100644 --- a/libs/plugins/a-exp.lv2/a-exp.c +++ b/libs/plugins/a-exp.lv2/a-exp.c @@ -36,6 +36,8 @@ #define RESET_PEAK_AFTER_SECONDS 3 +#define MINUS_60 0.0001f + #ifndef M_PI # define M_PI 3.14159265358979323846 #endif @@ -432,7 +434,7 @@ run(LV2_Handle instance, uint32_t n_samples) makeup_gain = makeup_target; } - *(aexp->outlevel) = (max_out < 0.0056f) ? -45.f : to_dB(max_out); + *(aexp->outlevel) = (max_out < 0.0001) ? -60.f : to_dB(max_out); *(aexp->inlevel) = in_peak_db; aexp->makeup_gain = makeup_gain; @@ -449,7 +451,7 @@ run(LV2_Handle instance, uint32_t n_samples) } } - const float v_lvl_out = (max_out < 0.001f) ? -1600.f : to_dB(max_out); + const float v_lvl_out = (max_out < MINUS_60) ? -60.f : to_dB(max_out); const float v_lvl_in = in_peak_db; if (fabsf (aexp->v_lvl_out - v_lvl_out) >= .1 || diff --git a/libs/plugins/a-exp.lv2/a-exp.ttl.in b/libs/plugins/a-exp.lv2/a-exp.ttl.in index 346fa2e572..9d6adde7b7 100644 --- a/libs/plugins/a-exp.lv2/a-exp.ttl.in +++ b/libs/plugins/a-exp.lv2/a-exp.ttl.in @@ -104,9 +104,9 @@ unit:db-display lv2:index 7 ; lv2:name "Input Level" ; lv2:symbol "inlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [ @@ -114,9 +114,9 @@ unit:db-display lv2:index 8 ; lv2:name "Output Level" ; lv2:symbol "outlevel" ; - lv2:default -45.000000 ; - lv2:minimum -45.000000 ; - lv2:maximum 0.000000 ; + lv2:default -60.000000 ; + lv2:minimum -60.000000 ; + lv2:maximum 10.000000 ; unit:unit unit:db-display ; ] , [