Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index d47b10a5989f2b2f662bd31be5e264915460d35d..13d0f6187ddb3914f9c20d6b65bdcd3d152b2e67 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -72,6 +72,7 @@ LevelMeterBase::~LevelMeterBase ()
        for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
                delete (*i).meter;
        }
+       meters.clear();
 }
 
 void
@@ -272,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()->color ("meter background bottom");
+               b[1] = ARDOUR_UI::config()->color ("meter background top");
                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()->color ("midi meter color0");
+                       c[1] = ARDOUR_UI::config()->color ("midi meter color1");
+                       c[2] = ARDOUR_UI::config()->color ("midi meter color2");
+                       c[3] = ARDOUR_UI::config()->color ("midi meter color3");
+                       c[4] = ARDOUR_UI::config()->color ("midi meter color4");
+                       c[5] = ARDOUR_UI::config()->color ("midi meter color5");
+                       c[6] = ARDOUR_UI::config()->color ("midi meter color6");
+                       c[7] = ARDOUR_UI::config()->color ("midi meter color7");
+                       c[8] = ARDOUR_UI::config()->color ("midi meter color8");
+                       c[9] = ARDOUR_UI::config()->color ("midi meter color9");
                        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()->color ("meter color0");
+                       c[1] = ARDOUR_UI::config()->color ("meter color1");
+                       c[2] = ARDOUR_UI::config()->color ("meter color2");
+                       c[3] = ARDOUR_UI::config()->color ("meter color3");
+                       c[4] = ARDOUR_UI::config()->color ("meter color4");
+                       c[5] = ARDOUR_UI::config()->color ("meter color5");
+                       c[6] = ARDOUR_UI::config()->color ("meter color6");
+                       c[7] = ARDOUR_UI::config()->color ("meter color7");
+                       c[8] = ARDOUR_UI::config()->color ("meter color8");
+                       c[9] = ARDOUR_UI::config()->color ("meter color9");
 
                        switch (meter_type) {
                                case MeterK20:
@@ -339,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:
@@ -435,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