peak-indicator threshold configuration

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index a398c7c8332ae0d658318c3d61fd2e423dd289ba..767754bca33702d7fccad6799286a3734d4de7a3 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -844,7 +844,7 @@ GainMeterBase::update_meters()
                        peak_display.set_label (buf);
                }
 
-               if (mpeak >= 0.0f) {
+               if (mpeak >= Config->get_meter_peak()) {
                        peak_display.set_name ("MixerStripPeakDisplayPeak");
                }
        }

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index da70fcf9244cac551efbd60fa2d328b0165b7ba5..fcb3561eaa192aa5fbdc4dda79539f2d0175183f 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -241,7 +241,7 @@ MeterStrip::fast_update ()
        float mpeak = level_meter->update_meters();
        if (mpeak > max_peak) {
                max_peak = mpeak;
-               if (mpeak >= -0.5f) {
+               if (mpeak >= Config->get_meter_peak()) {
                        peak_display.set_name ("meterbridge peakindicator on");
                        peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
                }

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index f44758939833cf6cd01a04969cb64e3f0cd18d0f..4edf1a04f4d53e24208a6e107eda8c334a76a570 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1937,6 +1937,14 @@ RCOptionEditor::RCOptionEditor ()
        mlu->add (MeteringLineUp15, _("-15dB"));
 
        add_option (S_("Preferences|GUI"), mlu);
+
+       add_option (S_("Preferences|GUI"),
+            new FaderOption (
+                    "meter-peak",
+                    _("Meter Peak Threshold"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_peak),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_peak)
+                    ));
 }
 
 void

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index fa1e23db4de3ad2fb8eec838f0e531b275d9a45b..f87781c8a93bb9bda98b76ddaa00b353814b85cd 100644 (file)
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -150,6 +150,7 @@ CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", fal
 CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
 CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 32.0f)
 CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18)
+CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f)
 
 /* miscellany */