From 8b5acdf4141c99dd66cfcc32e5f63b11b9cbfb62 Mon Sep 17 00:00:00 2001
From: Hans Baier <hansfbaier@googlemail.com>
Date: Tue, 30 Dec 2008 03:07:21 +0000
Subject: [PATCH] * reintroducing separate themeable Meter Style note colors

git-svn-id: svn://localhost/ardour2/branches/3.0@4359 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour3_ui_default.conf | 3 +++
 gtk2_ardour/canvas-note-event.h     | 8 ++++----
 gtk2_ardour/canvas_vars.h           | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 50f39efe02..79941e588d 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -59,6 +59,9 @@
     <Option name="midi bus base" value="00000000"/>
     <Option name="midi frame base" value="393d3766"/>
     <Option name="midi note inactive channel" value="bfbfbf88"/>
+    <Option name="midi note meter color max" value="ee33338a"/>
+    <Option name="midi note meter color mid" value="eeee338a"/>
+    <Option name="midi note meter color min" value="33ee338a"/>    
     <Option name="midi note selected" value="8888ff88"/>
     <Option name="midi note velocity text" value="000000ff"/>
     <Option name="midi program change fill" value="0000ffa0"/>
diff --git a/gtk2_ardour/canvas-note-event.h b/gtk2_ardour/canvas-note-event.h
index 28140267f6..ee22e00dac 100644
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -93,13 +93,13 @@ public:
 	{
 		if (vel < 64) {
 			return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_MeterColorBase.get(),
-					ARDOUR_UI::config()->canvasvar_MeterColorMid.get(),
+					ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorBase.get(),
+					ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get(),
 					(vel / (double)63.0));
 		} else {
 			return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->canvasvar_MeterColorMid.get(),
-					ARDOUR_UI::config()->canvasvar_MeterColorTop.get(),
+					ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get(),
+					ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorTop.get(),
 					((vel-64) / (double)63.0));
 		}
 	}
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 1141dbe8f1..1dfdd72d9a 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -57,6 +57,9 @@ CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
 CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
 CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
 CANVAS_VARIABLE(canvasvar_MidiNoteInactiveChannel, "midi note inactive channel")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorBase, "midi note meter color min")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorMid, "midi note meter color mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorTop, "miri note meter color max")
 CANVAS_VARIABLE(canvasvar_MidiNoteSelected, "midi note selected")
 CANVAS_VARIABLE(canvasvar_MidiNoteVelocityText, "midi note velocity text")
 CANVAS_VARIABLE(canvasvar_MidiProgramChangeFill, "midi program change fill")