From fb0de10b93dbc25d2c75757b858bf0f9b12c93a1 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 26 Sep 2014 16:10:06 +0200
Subject: [PATCH] un-hardcode DIN & VU meter-colors,

---
 gtk2_ardour/default_ui_config.in | 2 +-
 gtk2_ardour/level_meter.cc       | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index c4ad3de36c..126eb125c0 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -64,7 +64,7 @@
     <Option name="measure line beat" value="a29e9e76"/>
     <Option name="meter bar" value="626470cc"/>
     <Option name="meter fill: 0" value="008800ff"/>
-    <Option name="meter fill: 1" value="008800ff"/>
+    <Option name="meter fill: 1" value="00aa00ff"/>
     <Option name="meter fill: 2" value="00ff00ff"/>
     <Option name="meter fill: 3" value="00ff00ff"/>
     <Option name="meter fill: 4" value="fff000ff"/>
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index a9b96a8b6c..d47b10a598 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -355,7 +355,6 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_nordic(-18);
 					stp[2] = 115.0 * meter_deflect_nordic(-12);
 					stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored
-					//c[2] = c[3] = c[1]; // dark-green
 					c[0] = c[1] = c[2]; // bright-green
 					c[6] = c[7] = c[8] = c[9];
 					break;
@@ -364,7 +363,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_din(-18);
 					stp[2] = 115.0 * meter_deflect_din(-15); // ignored
 					stp[3] = 115.0 * meter_deflect_din( -9);
-					c[0] = c[1] = c[2] = c[3] = 0x00aa00ff;
+					c[0] = c[2] = c[3] = c[1];
 					c[4] = c[6];
 					c[5] = c[7];
 					break;
@@ -373,8 +372,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_vu(-23); // -3
 					stp[2] = 115.0 * meter_deflect_vu(-20); // 0
 					stp[3] = 115.0 * meter_deflect_vu(-18); // +2
-					c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff;
-					c[6] = c[7] = c[8] = c[9] = 0xff8800ff;
+					c[0] = c[2] = c[3] = c[4] = c[5] = c[1];
+					c[7] = c[8] = c[9] = c[6];
 					break;
 				default: // PEAK, RMS
 					stp[1] = 77.5;  // 115 * log_meter(-10)