Unify gain and draw tools.

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 3672edbc6dee16a8c6f7d1445fd1f58ce8b449a8..e7e16c8fc6be3ce17d714ff1d1ece36bfa69d4cc 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -273,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                uint32_t b[4];
                float stp[4];
                int styleflags = Config->get_meter_style_led() ? 3 : 1;
-               b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot();
-               b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop();
+               b[0] = ARDOUR_UI::config()->get_MeterBackgroundBot();
+               b[1] = ARDOUR_UI::config()->get_MeterBackgroundTop();
                b[2] = 0x991122ff; // red highlight gradient Bot
                b[3] = 0x551111ff; // red highlight gradient Top
                if (n < nmidi) {
-                       c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0();
-                       c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1();
-                       c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2();
-                       c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3();
-                       c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4();
-                       c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5();
-                       c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6();
-                       c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7();
-                       c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8();
-                       c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9();
+                       c[0] = ARDOUR_UI::config()->get_MidiMeterColor0();
+                       c[1] = ARDOUR_UI::config()->get_MidiMeterColor1();
+                       c[2] = ARDOUR_UI::config()->get_MidiMeterColor2();
+                       c[3] = ARDOUR_UI::config()->get_MidiMeterColor3();
+                       c[4] = ARDOUR_UI::config()->get_MidiMeterColor4();
+                       c[5] = ARDOUR_UI::config()->get_MidiMeterColor5();
+                       c[6] = ARDOUR_UI::config()->get_MidiMeterColor6();
+                       c[7] = ARDOUR_UI::config()->get_MidiMeterColor7();
+                       c[8] = ARDOUR_UI::config()->get_MidiMeterColor8();
+                       c[9] = ARDOUR_UI::config()->get_MidiMeterColor9();
                        stp[0] = 115.0 *  32.0 / 128.0;
                        stp[1] = 115.0 *  64.0 / 128.0;
                        stp[2] = 115.0 * 100.0 / 128.0;
                        stp[3] = 115.0 * 112.0 / 128.0;
                } else {
-                       c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0();
-                       c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1();
-                       c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2();
-                       c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3();
-                       c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4();
-                       c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5();
-                       c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6();
-                       c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7();
-                       c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8();
-                       c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9();
+                       c[0] = ARDOUR_UI::config()->get_MeterColor0();
+                       c[1] = ARDOUR_UI::config()->get_MeterColor1();
+                       c[2] = ARDOUR_UI::config()->get_MeterColor2();
+                       c[3] = ARDOUR_UI::config()->get_MeterColor3();
+                       c[4] = ARDOUR_UI::config()->get_MeterColor4();
+                       c[5] = ARDOUR_UI::config()->get_MeterColor5();
+                       c[6] = ARDOUR_UI::config()->get_MeterColor6();
+                       c[7] = ARDOUR_UI::config()->get_MeterColor7();
+                       c[8] = ARDOUR_UI::config()->get_MeterColor8();
+                       c[9] = ARDOUR_UI::config()->get_MeterColor9();
 
                        switch (meter_type) {
                                case MeterK20:
@@ -340,7 +340,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        break;
                                case MeterIEC2BBC:
                                        c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] =
-                                               ARDOUR_UI::config()->color_by_name ("meter color BBC");
+                                               ARDOUR_UI::config()->color ("meter color BBC");
                                        stp[0] = stp[1] = stp[2] = stp[3] = 115.0;
                                        break;
                                case MeterIEC2EBU:
@@ -436,7 +436,7 @@ LevelMeterBase::set_type(MeterType t)
 bool
 LevelMeterBase::meter_button_press (GdkEventButton* ev)
 {
-       return ButtonPress (ev); /* EMIT SIGNAL */
+       return !!ButtonPress (ev); /* EMIT SIGNAL */
 }
 
 bool