Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / meter_patterns.cc

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index 55eb16246a532e5fcc2e4d66de8614827adceee6..392693fe5d87ca4ad5ed1d72b01b3f7076cd09a3 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -226,56 +226,52 @@ static void mtr_red_stripe(cairo_t* cr, float l, float w, int h, float top, floa
        cairo_fill (cr);
 }
 
-static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
-       float r,g,b;
+static void set_bg_color (Gtk::Widget& w, cairo_t* cr, MeterType type) {
+       double r,g,b,a;
        switch(type) {
                case MeterVU:
-                       if (rgba_p_from_style("meterstripVU", &r, &g, &b, "bg")) {
-                               cairo_set_source_rgb (cr, r, g, b);
-                       } else {
-                               cairo_set_source_rgb (cr, 1.0, 1.0, 0.85);
-                       }
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu bg"), r, g, b, a);
                        break;
                case MeterIEC1DIN:
                case MeterIEC1NOR:
                case MeterIEC2BBC:
                case MeterIEC2EBU:
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm bg"), r, g, b, a);
+                       break;
                case MeterK12:
                case MeterK14:
                case MeterK20:
-                       if (rgba_p_from_style("meterstripPPM", &r, &g, &b, "bg")) {
-                               cairo_set_source_rgb (cr, r, g, b);
-                       } else {
-                               cairo_set_source_rgb (cr, 0.1, 0.1, 0.1);
-                       }
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm bg"), r, g, b, a);
                        break;
                default:
                        {
                        Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_ACTIVE);
-                       cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+                       r = c.get_red_p();
+                       g = c.get_green_p();
+                       b = c.get_blue_p();
                        }
                        break;
        }
+       cairo_set_source_rgb (cr, r, g, b);
 }
 
 static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
-       float r,g,b;
+       double r,g,b,a;
        switch(type) {
                case MeterVU:
-                       if (rgba_p_from_style("meterstripVU", &r, &g, &b)) {
-                               c->set_rgb_p(r, g, b);
-                       } else {
-                               c->set_rgb_p(0.0, 0.0, 0.0);
-                       }
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu fg"), r, g, b, a);
+                       break;
+               case MeterIEC1DIN:
+               case MeterIEC1NOR:
+               case MeterIEC2BBC:
+               case MeterIEC2EBU:
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm fg"), r, g, b, a);
                        break;
                default:
-                       if (rgba_p_from_style("meterstripPPM", &r, &g, &b)) {
-                               c->set_rgb_p(r, g, b);
-                       } else {
-                               c->set_rgb_p(1.0, 1.0, 1.0);
-                       }
+                       ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm fg"), r, g, b, a);
                        break;
        }
+       c->set_rgb_p (r, g, b);
 }
 
 static cairo_pattern_t*
@@ -328,7 +324,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
        cairo_fill (cr);
 
        height = min(max_pattern_metric_size, height);
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
+       uint32_t peakcolor = ARDOUR_UI::config()->color ("meterbridge peaklabel");
 
        for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
 
@@ -614,7 +610,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
        Pango::AttrFontDesc* font_attr;
        Pango::FontDescription font;
 
-       font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallMonospaceFont());
+       font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallMonospaceFont());
        double fixfontsize = 81920.0 / (double) ARDOUR::Config->get_font_scale();
 
        font.set_weight (Pango::WEIGHT_NORMAL);
@@ -650,7 +646,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
        cairo_set_line_width (cr, 1.0);
 
        height = min(max_pattern_metric_size, height);
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
+       uint32_t peakcolor = ARDOUR_UI::config()->color ("meterbridge peaklabel");
        Gdk::Color c; // default text color
 
        for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {