summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-06 00:01:51 +0200
committerRobin Gareus <robin@gareus.org>2013-07-10 15:27:11 +0200
commit6d0907089550571628b35774c371f2bbdd576fef (patch)
tree47556c5cd744c9d98bf7de8754719cf4736d4e9a
parent7df8ab494a20d228788ed93558e334ffd0744398 (diff)
peak-indicator threshold configuration
-rw-r--r--gtk2_ardour/gain_meter.cc2
-rw-r--r--gtk2_ardour/meter_strip.cc2
-rw-r--r--gtk2_ardour/rc_option_editor.cc8
-rw-r--r--libs/ardour/ardour/rc_configuration_vars.h1
4 files changed, 11 insertions, 2 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index a398c7c833..767754bca3 100644
--- 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 da70fcf924..fcb3561eaa 100644
--- 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 f447589398..4edf1a04f4 100644
--- 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 fa1e23db4d..f87781c8a9 100644
--- 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 */