use ArdourMono font for metric patterns

[ardour.git] / gtk2_ardour / meter_patterns.cc

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index ccf24fcefc9a7678b03fe5bb53bdc1b5b6c14df0..9a2cab00b58cb802867f281949f89d1eb3459538 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -64,15 +64,6 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
                case MeterKrms:
                        return _("RMS + Peak");
                        break;
-               case MeterIEC1:
-                       return _("DIN");
-                       break;
-               case MeterIEC2:
-                       return _("EBU/BBC");
-                       break;
-               case MeterVU:
-                       return _("VU");
-                       break;
                default:
                        return _("???");
                        break;
@@ -233,13 +224,14 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
 {
        Glib::RefPtr<Gdk::Window> win (w.get_window());
 
-       bool tickleft;
+       bool tickleft, tickright;
        bool background;
        gint width, height;
        win->get_size (width, height);
 
        tickleft = w.get_name().substr(w.get_name().length() - 4) == "Left";
-       background = types.size() == 0 || tickleft || w.get_name().substr(w.get_name().length() - 5) == "Right";
+       tickright = w.get_name().substr(w.get_name().length() - 5) == "Right";
+       background = types.size() == 0 || tickleft || tickright;
 
        cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
        cairo_t* cr = cairo_create (surface);
@@ -252,9 +244,7 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
        Pango::AttrFontDesc* font_attr;
        Pango::FontDescription font;
 
-       font = Pango::FontDescription (""); // use defaults
-       //font = get_font_for_style("gain-fader");
-       //font = w.get_style()->get_font();
+       font = Pango::FontDescription ("ArdourMono");
 
        font.set_weight (Pango::WEIGHT_NORMAL);
        font.set_size (9.0 * PANGO_SCALE);
@@ -264,12 +254,12 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
 
        font.set_weight (Pango::WEIGHT_ULTRALIGHT);
        font.set_stretch (Pango::STRETCH_ULTRA_CONDENSED);
-       font.set_size (7.5 * PANGO_SCALE);
+       font.set_size (8.0 * PANGO_SCALE);
        font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
        midi_font_attributes.change (*font_attr);
        delete font_attr;
 
-       font.set_size (7.0 * PANGO_SCALE);
+       font.set_size (6.0 * PANGO_SCALE);
        font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
        unit_font_attributes.change (*font_attr);
        delete font_attr;
@@ -305,6 +295,11 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
                } else {
                        c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
                        cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+
+                       if (!tickleft && !tickright && (*i) == DataType::AUDIO) {
+                               tickleft = true;
+                       }
+
                }
 
                std::map<int,float> points;
@@ -373,13 +368,14 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
                                snprintf (buf, sizeof (buf), "%+2d", j->first);
                                pos = height - (gint) floor (height * fraction);
                                if (tickleft) {
-                                       cairo_move_to(cr, width-2.5, pos + .5);
+                                       cairo_move_to(cr, width-1.5, pos + .5);
                                        cairo_line_to(cr, width, pos + .5);
-                               } else {
+                                       cairo_stroke (cr);
+                               } else if (tickright) {
                                        cairo_move_to(cr, 0, pos + .5);
-                                       cairo_line_to(cr, 2.5, pos + .5);
+                                       cairo_line_to(cr, 1.5, pos + .5);
+                                       cairo_stroke (cr);
                                }
-                               cairo_stroke (cr);
                                break;
                        case DataType::MIDI:
                                cairo_set_line_width (cr, 1.0);
@@ -387,12 +383,15 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
                                snprintf (buf, sizeof (buf), "%3d", j->first);
                                pos = 1 + height - (gint) rintf (height * fraction);
                                pos = min (pos, height);
+#if 0
                                if (tickleft) {
                                        cairo_arc(cr, width - 2.0, pos + .5, 1.0, 0, 2 * M_PI);
-                               } else {
+                                       cairo_fill(cr);
+                               } else if (tickright) {
                                        cairo_arc(cr, 3, pos + .5, 1.0, 0, 2 * M_PI);
+                                       cairo_fill(cr);
                                }
-                               cairo_fill(cr);
+#endif
                                break;
                        }
 
@@ -407,7 +406,7 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
                        p = min (p, height - th);
                        p = max (p, 0);
 
-                       cairo_move_to (cr, width-4-tw, p);
+                       cairo_move_to (cr, width-3-tw, p);
                        pango_cairo_show_layout (cr, layout->gobj());
                }
        }