From 37790cb764faa5e8f9613f9a2aaf1408c745bbeb Mon Sep 17 00:00:00 2001 From: Nikolay Date: Wed, 29 Apr 2015 16:38:46 +0300 Subject: [PATCH] [Summary] Fix bug in commit: According PRD change colour of numeric peak indicator background depend on its value. 5ab6bbe6e181375984a533f73a353abce8eee3c0 [5ab6bbe] Also show value "0.0" in numeric peak indicator instead of "-0.0" [Feature reviewed] AMishyn [Reviewed] GZharun --- gtk2_ardour/gain_meter.cc | 8 ++++---- libs/ardour/ardour/rc_configuration_vars.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 55a352136d..013ff8171a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -923,7 +923,7 @@ GainMeter::_astyle_string (AutoStyle style, bool shrt) namespace { float round_to_tenths (float value) { - return (float)((int)(value*10))/10; + return round(value*10)/10.0f; } } @@ -931,7 +931,7 @@ void GainMeter::update_meters() { char buf[32]; - float mpeak = level_meter.update_meters(); + float mpeak = round_to_tenths (level_meter.update_meters()); if (mpeak > max_peak) { max_peak = mpeak; @@ -940,12 +940,12 @@ GainMeter::update_meters() peak_display_button.modify_bg(Gtk::STATE_NORMAL, _peak_level_3_color); peak_display_button.modify_bg(Gtk::STATE_ACTIVE, _peak_level_3_color); } else { - mpeak = round_to_tenths (mpeak); + mpeak = (mpeak == 0.0f) ? 0.0f : mpeak; snprintf (buf, sizeof(buf), "%.1f", mpeak); peak_display_button.set_text (buf); Gdk::Color color; - if (mpeak <= Config->get_meter_peak_2()) { + if (mpeak < Config->get_meter_peak_2()) { color = _peak_level_3_color; } else if (mpeak < Config->get_meter_peak()) { color = _peak_level_2_color; diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index d35bdf4f8c..c72dedb2ec 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -171,7 +171,7 @@ CONFIG_VARIABLE (VUMeterStandard, meter_vu_standard, "meter-vu-standard", Meteri CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18) CONFIG_VARIABLE (MeterLineUp, meter_line_up_din, "meter-line-up-din", MeteringLineUp15) CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f) -CONFIG_VARIABLE (float, meter_peak_2, "meter_peak_2", -6.0f) +CONFIG_VARIABLE (float, meter_peak_2, "meter_peak_2", -5.9f) CONFIG_VARIABLE (float, numeric_peak_min_treshold, "numeric-peak-min-treshold", -144.4f) CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", true) CONFIG_VARIABLE (bool, show_editor_meter, "show-editor-meter", true)