Fix meter colour names for consistency.

git-svn-id: svn://localhost/ardour2/trunk@2805 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 43c60275634d6679f077d64bdb45ed28458997d9..108782953b15dc19bc08e4f374df4555977344fa 100644 (file)
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -41,7 +41,7 @@
     <Option name="verbose canvas cursor" value="f4f214bc"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="marker bar separator" value="aaaaaa77"/>
-       <Option name="meter  bar" value="666672ff"/>
+       <Option name="meter bar" value="666672ff"/>
     <Option name="tempo bar" value="72727fff"/>
        <Option name="range marker bar" value="7f7f8cff"/>
     <Option name="transport marker bar" value="8c8c96ff"/>
@@ -83,10 +83,10 @@
     <Option name="trim handle" value="1900ff44"/>
     <Option name="edit point" value="0000ffff"/>
     <Option name="play head" value="ff0000ff"/>
-       <Option name="MeterColorBase" value="0000ffff"/>
-    <Option name="MeterColorMid" value="73f9baff"/>
-    <Option name="MeterColorTop" value="00fd5dff"/>
-    <Option name="MeterColorClip" value="ff0000ff"/>
+       <Option name="meter fill min" value="0000ffff"/>
+    <Option name="meter fill mid" value="73f9baff"/>
+    <Option name="meter fill max" value="00fd5dff"/>
+    <Option name="meter fill clip" value="ff0000ff"/>
     <Option name="midi select rect outline" value="5555ffff"/>
     <Option name="midi select rect fill" value="8888ff88"/>
     <Option name="midi note outline min" value="22ff22b0"/>

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 5c682c5aa140e08358cde348263e5ba8fde626eb..fc73d49608a35bd10a7d9e67253dbc05ae1a8f4d 100644 (file)
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -80,10 +80,10 @@ CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
 CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
 CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
 CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
-CANVAS_VARIABLE(canvasvar_MeterColorBase, "MeterColorBase")
-CANVAS_VARIABLE(canvasvar_MeterColorMid, "MeterColorMid")
-CANVAS_VARIABLE(canvasvar_MeterColorTop, "MeterColorTop")
-CANVAS_VARIABLE(canvasvar_MeterColorClip, "MeterColorClip")
+CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min")
+CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")
+CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
+CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
 CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
 CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
 CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")