Use PBD::ffs for portability

[ardour.git] / gtk2_ardour / meter_patterns.cc

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index cb5209d8ea35964d478ec49d3d0a1f2c776939db..7818711922707de748a33506dda265ed5eaa2bd6 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -54,6 +54,21 @@ namespace ArdourMeter {
 static ArdourMeter::TickPatterns ticks_patterns;
 static ArdourMeter::MetricPatterns metric_patterns;
 
+const std::string
+ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
+{
+       switch (mt) {
+               case MeterPeak:
+                       return _("Peak");
+                       break;
+               case MeterKrms:
+                       return _("RMS + Peak");
+                       break;
+               default:
+                       return _("???");
+                       break;
+       }
+}
 
 static cairo_pattern_t*
 meter_render_ticks (Gtk::Widget& w, vector<ARDOUR::DataType> types)
@@ -349,11 +364,11 @@ 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_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);
                                break;
@@ -383,7 +398,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());
                }
        }