dedicated color-theme entry for peak-metrics

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 3bc7c5f08d589b0aae86cbf0977cb373525525ea..b029f8835578480856e95e3ad0d4f8850923ba12 100644 (file)
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -207,6 +207,7 @@
     <Option name="solo safe: led active" value="ff0000ff"/>
     <Option name="solo safe: text" value="c7c7d8ff"/>
     <Option name="solo safe: text active" value="c8c8d9ff"/>
+    <Option name="meterbridge peaklabel" value="ff0000ff"/>
     <Option name="meterbridge peakindicator: fill start" value="444444ff"/>
     <Option name="meterbridge peakindicator: fill end" value="333333ff"/>
     <Option name="meterbridge peakindicator on: fill start" value="ff0000ff"/>

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 334e8cc00b139c15cab8b426820dbe4d5ae77786..7859ccd649df73555c9f25ae421f755611f10c09 100644 (file)
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -64,6 +64,7 @@ CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
 CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
 CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
 CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
+CANVAS_VARIABLE(canvasvar_MeterBridgePeakLabel, "meterbridge peaklabel")
 CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min")
 CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
 CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 52f0eb6293e26d95cd7983dcac163def23acc0c2..a7b5d0e55631f6b6298526d9e6e80129a4f0ae75 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -383,7 +383,7 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
        cairo_fill (cr);
 
        height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peakindicator on: fill start");
+       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
 
        for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
 
@@ -587,7 +587,7 @@ MeterStrip::render_ticks (Gtk::Widget& w, vector<DataType> types)
        cairo_fill (cr);
 
        height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peakindicator on: fill start");
+       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
 
        for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {