X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_patterns.cc;h=ab6b9446d3dd82e10481a4b53d876f21194719d0;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=cbe07cf1c8a2d859ed805b455b7fb3014a4852a1;hpb=91b55c194c5724aa0122c42794dbafd67cf91445;p=ardour.git

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index cbe07cf1c8..ab6b9446d3 100644
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -17,20 +17,23 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <gtkmm/drawingarea.h>
+
 #include <gtkmm2ext/cairo_widget.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/rgb_macros.h>
 
 #include <ardour/rc_configuration.h>
-#include "ardour_ui.h"
 #include "utils.h"
 #include "logmeter.h"
 #include "meter_patterns.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -78,7 +81,10 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
 {
 	switch (mt) {
 		case MeterPeak:
-			return _("Peak");
+			return _("Peak (+6dBFS)");
+			break;
+		case MeterPeak0dB:
+			return _("Peak (0dBFS)");
 			break;
 		case MeterKrms:
 			return _("RMS + Peak");
@@ -96,15 +102,19 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
 			return _("IEC2/EBU");
 			break;
 		case MeterK20:
-			return _("K20");
+			return _("K20/RMS");
 			break;
 		case MeterK14:
-			return _("K14");
+			return _("K14/RMS");
+			break;
+		case MeterK12:
+			return _("K12/RMS");
 			break;
 		case MeterVU:
 			return _("VU");
 			break;
 		default:
+			assert(0);
 			return _("???");
 			break;
 	}
@@ -137,13 +147,9 @@ static inline float mtr_col_and_fract(
 				cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
 			}
 			break;
-		case MeterIEC2BBC:
-			fraction = meter_deflect_ppm(val);
-			cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
-			break;
-		case MeterIEC2EBU:
-			fraction = meter_deflect_ppm(val);
-			if (val >= -10.0) {
+		case MeterPeak0dB:
+			fraction = log_meter0dB (val);
+			if (val >= 0 || val == -9) {
 				cairo_set_source_rgb (cr,
 						UINT_RGBA_R_FLT(peakcolor),
 						UINT_RGBA_G_FLT(peakcolor),
@@ -152,9 +158,15 @@ static inline float mtr_col_and_fract(
 				cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
 			}
 			break;
+		case MeterIEC2BBC:
+		case MeterIEC2EBU:
+			fraction = meter_deflect_ppm(val);
+			cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
+			break;
 		case MeterIEC1NOR:
 			fraction = meter_deflect_nordic(val);
-			if (val >= -12.0) {
+#if 0
+			if (val == -18.0) {
 				cairo_set_source_rgb (cr,
 						UINT_RGBA_R_FLT(peakcolor),
 						UINT_RGBA_G_FLT(peakcolor),
@@ -162,10 +174,13 @@ static inline float mtr_col_and_fract(
 			} else {
 				cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
 			}
+#else
+			cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
+#endif
 			break;
 		case MeterIEC1DIN:
 			fraction = meter_deflect_din(val);
-			if (val >= -9.0) {
+			if (val == -9.0 || val == -15 || val == -18) {
 				cairo_set_source_rgb (cr,
 						UINT_RGBA_R_FLT(peakcolor),
 						UINT_RGBA_G_FLT(peakcolor),
@@ -205,59 +220,75 @@ static inline float mtr_col_and_fract(
 			}
 			fraction = meter_deflect_k (val, 14);
 			break;
+		case MeterK12:
+			if (val >= -8.0) {
+				cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); // red
+			} else if (val >= -12.0) {
+				cairo_set_source_rgb (cr, 0.8, 0.8, 0.0); // yellow
+			} else {
+				cairo_set_source_rgb (cr, 0.0, 1.0, 0.0); // green
+			}
+			fraction = meter_deflect_k (val, 12);
+			break;
 	}
 	return fraction;
 }
 
-static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
-	float r,g,b;
+static void mtr_red_stripe(cairo_t* cr, float l, float w, int h, float top, float bot) {
+	if (w <= 0) return;
+	int t = h - floorf (h * (top));
+	int b = h - floorf (h * (bot));
+	cairo_set_source_rgba (cr, .75, 0, 0, 0.75);
+	cairo_rectangle (cr, l, t + .5, w, b - t);
+	cairo_fill (cr);
+}
+
+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 (UIConfiguration::instance().color ("meterstrip vu bg"), r, g, b, a);
 			break;
 		case MeterIEC1DIN:
 		case MeterIEC1NOR:
 		case MeterIEC2BBC:
 		case MeterIEC2EBU:
+			ArdourCanvas::color_to_rgba (UIConfiguration::instance().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 (UIConfiguration::instance().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& w, MeterType type, Gdk::Color * c) {
-	float r,g,b;
+static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
+	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 (UIConfiguration::instance().color ("meterstrip vu fg"), r, g, b, a);
+			break;
+		case MeterIEC1DIN:
+		case MeterIEC1NOR:
+		case MeterIEC2BBC:
+		case MeterIEC2EBU:
+			ArdourCanvas::color_to_rgba (UIConfiguration::instance().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 (UIConfiguration::instance().color ("meterstrip dpm fg"), r, g, b, a);
 			break;
 	}
+	c->set_rgb_p (r, g, b);
 }
 
 static cairo_pattern_t*
@@ -266,11 +297,36 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 	Glib::RefPtr<Gdk::Window> win (w.get_window());
 
 	bool background;
+	bool tickleft, tickright;
 	gint width, height;
 	win->get_size (width, height);
-	background = types.size() == 0
-		|| w.get_name().substr(w.get_name().length() - 4) == "Left"
-		|| w.get_name().substr(w.get_name().length() - 5) == "Right";
+	tickleft = w.get_name().substr(w.get_name().length() - 4) == "Left";
+	tickright = w.get_name().substr(w.get_name().length() - 5) == "Right";
+	background = types.size() == 0 || tickleft || tickright;
+
+	float box_l=0;
+	float box_w=0;
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
+	if (tickleft) {
+		if (w.get_name().substr(0, 3) == "Bar") {
+			box_w = PX_SCALE(2, 2);
+			box_l = width - box_w;
+		} else if (w.get_name().substr(0, 4) == "Mark") {
+			box_w = PX_SCALE(2, 2);
+			box_l = width - box_w;
+			background = false;
+		}
+	} else if (tickright) {
+		if (w.get_name().substr(0, 3) == "Bar") {
+			box_l = 0; box_w = PX_SCALE(2, 2);
+		} else if (w.get_name().substr(0, 4) == "Mark") {
+			box_l = 0; box_w = PX_SCALE(2, 2);
+			background = false;
+		}
+	} else {
+		box_l = 0; box_w = width;
+	}
+#undef PX_SCALE
 
 	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
 	cairo_t* cr = cairo_create (surface);
@@ -289,7 +345,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 = UIConfiguration::instance().color ("meterbridge peaklabel");
 
 	for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
 
@@ -299,11 +355,9 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 			c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
 		} else if (background) {
 			set_fg_color(w, type, &c);
-			cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
 		} 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());
 
 		// tick-maker position in dBFS, line-thickness
 		std::map<float,float> points;
@@ -312,6 +366,20 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 		case DataType::AUDIO:
 
 			switch (type) {
+				case MeterK12:
+					points.insert (std::pair<float,float>(-52.0f, 1.0));
+					points.insert (std::pair<float,float>(-42.0f, 1.0));
+					points.insert (std::pair<float,float>(-32.0f, 1.0));
+					points.insert (std::pair<float,float>(-22.0f, 1.0));
+					points.insert (std::pair<float,float>(-18.0f, 1.0));
+					points.insert (std::pair<float,float>(-15.0f, 1.0));
+					points.insert (std::pair<float,float>(-12.0f, 1.0));
+					points.insert (std::pair<float,float>( -9.0f, 1.0));
+					points.insert (std::pair<float,float>( -8.0f, 0.8));
+					points.insert (std::pair<float,float>( -6.0f, 1.0));
+					points.insert (std::pair<float,float>( -3.0f, 1.0));
+					points.insert (std::pair<float,float>(  0.0f, 1.0));
+					break;
 				case MeterK14:
 					points.insert (std::pair<float,float>(-54.0f, 1.0));
 					points.insert (std::pair<float,float>(-44.0f, 1.0));
@@ -319,10 +387,11 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(-24.0f, 1.0));
 					points.insert (std::pair<float,float>(-20.0f, 1.0));
 					points.insert (std::pair<float,float>(-17.0f, 1.0));
-					points.insert (std::pair<float,float>(-14.0f, 1.0));
-					points.insert (std::pair<float,float>(-11.0f, 1.0));
-					points.insert (std::pair<float,float>( -8.0f, 1.0));
-					points.insert (std::pair<float,float>( -4.0f, 1.0));
+					points.insert (std::pair<float,float>(-14.0f, 1.0)); //   0
+					points.insert (std::pair<float,float>(-11.0f, 1.0)); //  +3
+					points.insert (std::pair<float,float>(-10.0f, 0.8)); //  +4
+					points.insert (std::pair<float,float>( -8.0f, 1.0)); //  +6
+					points.insert (std::pair<float,float>( -4.0f, 1.0)); // +10
 					points.insert (std::pair<float,float>(  0.0f, 1.0));
 					break;
 				case MeterK20:
@@ -332,12 +401,13 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(-30.0f, 1.0));
 					points.insert (std::pair<float,float>(-26.0f, 1.0));
 					points.insert (std::pair<float,float>(-23.0f, 1.0));
-					points.insert (std::pair<float,float>(-20.0f, 1.0));
+					points.insert (std::pair<float,float>(-20.0f, 1.0)); //  0
 					points.insert (std::pair<float,float>(-17.0f, 1.0));
-					points.insert (std::pair<float,float>(-14.0f, 1.0));
+					points.insert (std::pair<float,float>(-16.0f, 0.8));
+					points.insert (std::pair<float,float>(-14.0f, 1.0)); // +6
 					points.insert (std::pair<float,float>(-10.0f, 1.0));
 					points.insert (std::pair<float,float>( -5.0f, 1.0));
-					points.insert (std::pair<float,float>(  0.0f, 1.0));
+					points.insert (std::pair<float,float>(  0.0f, 1.0)); //+20
 					break;
 				case MeterIEC2EBU:
 					points.insert (std::pair<float,float>(-30.0f, 1.0));
@@ -351,7 +421,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(-14.0f, 1.0));
 					points.insert (std::pair<float,float>(-12.0f, 0.5));
 					points.insert (std::pair<float,float>(-10.0f, 1.0));
-					points.insert (std::pair<float,float>( -9.0f, 0.5));
+					points.insert (std::pair<float,float>( -9.0f, 0.8));
 					points.insert (std::pair<float,float>( -8.0f, 0.5));
 					points.insert (std::pair<float,float>( -6.0f, 1.0));
 					break;
@@ -375,31 +445,46 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(-39.0f, 0.5));
 					points.insert (std::pair<float,float>(-36.0f, 1.0));
 
-					points.insert (std::pair<float,float>(-33.0f, 1.0));
+					points.insert (std::pair<float,float>(-33.0f, 0.5));
 					points.insert (std::pair<float,float>(-30.0f, 1.0));
-					points.insert (std::pair<float,float>(-27.0f, 1.0));
+					points.insert (std::pair<float,float>(-27.0f, 0.5));
 					points.insert (std::pair<float,float>(-24.0f, 1.0));
-					points.insert (std::pair<float,float>(-21.0f, 1.0));
+					points.insert (std::pair<float,float>(-21.0f, 0.5));
 
 					points.insert (std::pair<float,float>(-18.0f, 1.0));
-					points.insert (std::pair<float,float>(-15.0f, 1.0));
+					points.insert (std::pair<float,float>(-15.0f, 0.5));
 					points.insert (std::pair<float,float>(-12.0f, 1.0));
 					points.insert (std::pair<float,float>( -9.0f, 1.0));
-					points.insert (std::pair<float,float>( -6.0f, 1.0));
+					points.insert (std::pair<float,float>( -6.0f, 0.5));
+					mtr_red_stripe(cr, box_l, box_w, height,
+							meter_deflect_nordic(-6.0f), meter_deflect_nordic(-12.0f));
 					break;
 				case MeterIEC1DIN:
 					points.insert (std::pair<float,float>( -3.0f, 0.5)); // "200%"
-					points.insert (std::pair<float,float>( -4.0f, 1.0)); // "100%"
-					points.insert (std::pair<float,float>( -9.0f, 1.0));
+					points.insert (std::pair<float,float>( -4.0f, 1.0));
+					points.insert (std::pair<float,float>( -5.0f, 0.5));
+					points.insert (std::pair<float,float>( -6.0f, 0.5));
+					points.insert (std::pair<float,float>( -7.0f, 0.5));
+					points.insert (std::pair<float,float>( -8.0f, 0.5));
+					points.insert (std::pair<float,float>( -9.0f, 1.0)); // "100%"
+					points.insert (std::pair<float,float>(-10.0f, 0.5));
+					points.insert (std::pair<float,float>(-11.0f, 0.5));
+					points.insert (std::pair<float,float>(-12.0f, 0.5));
+					points.insert (std::pair<float,float>(-13.0f, 0.5));
 					points.insert (std::pair<float,float>(-14.0f, 1.0));
-					points.insert (std::pair<float,float>(-15.0f, 0.5)); // "50%"
-					points.insert (std::pair<float,float>(-18.0f, 0.5)); // "-9"
-					points.insert (std::pair<float,float>(-19.0f, 1.0)); // "30%"
-					points.insert (std::pair<float,float>(-29.0f, 1.0)); // "10%"
-					points.insert (std::pair<float,float>(-35.0f, 0.5)); // "5%" " -20"
-					points.insert (std::pair<float,float>(-39.0f, 1.0)); // "3%"
-					points.insert (std::pair<float,float>(-49.0f, 0.5)); // "1%"
+					points.insert (std::pair<float,float>(-15.0f, 0.8)); // "50%"
+					points.insert (std::pair<float,float>(-18.0f, 0.8)); // "-9"
+					points.insert (std::pair<float,float>(-19.0f, 1.0));
+					points.insert (std::pair<float,float>(-24.0f, 0.5));
+					points.insert (std::pair<float,float>(-29.0f, 1.0)); // "-20", "10%"
+					points.insert (std::pair<float,float>(-34.0f, 0.5)); // -25
+					//points.insert (std::pair<float,float>(-35.0f, 0.5)); // "5%" " -20"
+					points.insert (std::pair<float,float>(-39.0f, 1.0));
+					points.insert (std::pair<float,float>(-49.0f, 1.0));
+					points.insert (std::pair<float,float>(-54.0f, 0.5));
 					points.insert (std::pair<float,float>(-59.0f, 1.0));
+					mtr_red_stripe(cr, box_l, box_w, height,
+							meter_deflect_din(0.0f), meter_deflect_din(-9.0f));
 					break;
 				case MeterVU:
 					points.insert (std::pair<float,float>(-17.0f, 1.0)); //+3 VU
@@ -418,14 +503,24 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>(-30.0f, 1.0));
 					points.insert (std::pair<float,float>(-35.0f, 0.5));
 					points.insert (std::pair<float,float>(-40.0f, 1.0));
+					mtr_red_stripe(cr, box_l, box_w, height,
+							meter_deflect_vu(-17.0f), meter_deflect_vu(-20.0f));
 					break;
 
 				default:
+					points.insert (std::pair<float,float>(  0, 1.0));
+					points.insert (std::pair<float,float>(  1, 0.5));
+					points.insert (std::pair<float,float>(  2, 0.5));
+					points.insert (std::pair<float,float>(  3, 1.0));
+					points.insert (std::pair<float,float>(  4, 0.5));
+					points.insert (std::pair<float,float>(  5, 0.5));
+					// no break
+				case MeterPeak0dB:
 					points.insert (std::pair<float,float>(-60, 0.5));
 					points.insert (std::pair<float,float>(-50, 1.0));
 					points.insert (std::pair<float,float>(-40, 1.0));
 					points.insert (std::pair<float,float>(-30, 1.0));
-					if (Config->get_meter_line_up_level() == MeteringLineUp24) {
+					if (UIConfiguration::instance().get_meter_line_up_level() == MeteringLineUp24) {
 						points.insert (std::pair<float,float>(-24, 1.0));
 					} else {
 						points.insert (std::pair<float,float>(-25, 1.0));
@@ -453,13 +548,6 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 					points.insert (std::pair<float,float>( -3, 1.0));
 					points.insert (std::pair<float,float>( -2, 0.5));
 					points.insert (std::pair<float,float>( -1, 0.5));
-
-					points.insert (std::pair<float,float>(  0, 1.0));
-					points.insert (std::pair<float,float>(  1, 0.5));
-					points.insert (std::pair<float,float>(  2, 0.5));
-					points.insert (std::pair<float,float>(  3, 1.0));
-					points.insert (std::pair<float,float>(  4, 0.5));
-					points.insert (std::pair<float,float>(  5, 0.5));
 					break;
 			}
 			break;
@@ -491,14 +579,15 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 				pos = height - (gint) floor (height * fraction);
 				pos = max (pos, 1);
 				cairo_move_to(cr, 0, pos + .5);
-				cairo_line_to(cr, 3, pos + .5);
+				cairo_line_to(cr, width, pos + .5);
 				cairo_stroke (cr);
 				break;
 			case DataType::MIDI:
 				fraction = (j->first) / 127.0;
 				pos = 1 + height - (gint) floor (height * fraction);
 				pos = min (pos, height);
-				cairo_arc(cr, 1.5, pos + .5, 1.0, 0, 2 * M_PI);
+				cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+				cairo_arc(cr, width * .5, pos + .5, 1.0, 0, 2 * M_PI);
 				cairo_fill(cr);
 				break;
 			}
@@ -532,8 +621,14 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 		tickright = true;
 	}
 
+#ifdef NO_OVERSAMPLE
 	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
 	cairo_t* cr = cairo_create (surface);
+#else
+	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width*2, height*2);
+	cairo_t* cr = cairo_create (surface);
+	cairo_scale(cr, 2.0, 2.0);
+#endif
 	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(w.get_pango_context());
 
 	Pango::AttrList audio_font_attributes;
@@ -543,23 +638,28 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 	Pango::AttrFontDesc* font_attr;
 	Pango::FontDescription font;
 
-	font = Pango::FontDescription ("ArdourMono");
-	double fixfontsize = 81920.0 / (double) ARDOUR::Config->get_font_scale();
+	font = Pango::FontDescription (UIConfiguration::instance().get_SmallMonospaceFont());
+#ifdef __APPLE__
+	const double fixfontsize = 1.0;
+#else
+	// counter-act global font-scaling.
+	const double fixfontsize = std::min(1.0, 0.9 / sqrtf(UIConfiguration::instance().get_ui_scale()));
+#endif
 
 	font.set_weight (Pango::WEIGHT_NORMAL);
-	font.set_size (9.0 * PANGO_SCALE * fixfontsize);
+	font.set_size (8.0 * fixfontsize * PANGO_SCALE);
 	font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 	audio_font_attributes.change (*font_attr);
 	delete font_attr;
 
 	font.set_weight (Pango::WEIGHT_ULTRALIGHT);
 	font.set_stretch (Pango::STRETCH_ULTRA_CONDENSED);
-	font.set_size (8.0 * PANGO_SCALE * fixfontsize);
+	font.set_size (7.0 * fixfontsize * 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 (6.0 * PANGO_SCALE * fixfontsize);
+	font.set_size (6.0 * fixfontsize * PANGO_SCALE);
 	font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 	unit_font_attributes.change (*font_attr);
 	delete font_attr;
@@ -579,7 +679,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 = UIConfiguration::instance().color ("meterbridge peaklabel");
 	Gdk::Color c; // default text color
 
 	for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
@@ -602,7 +702,24 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 		switch (*i) {
 		case DataType::AUDIO:
 			layout->set_attributes (audio_font_attributes);
+			if (type == MeterPeak0dB) {
+				overlay_midi = 4;
+			}
 			switch (type) {
+				case MeterK12:
+					overlay_midi = 0;
+					points.insert (std::pair<float,string>(-52.0f, "-40"));
+					points.insert (std::pair<float,string>(-42.0f, "-30"));
+					points.insert (std::pair<float,string>(-32.0f, "-20"));
+					points.insert (std::pair<float,string>(-22.0f, "-10"));
+					points.insert (std::pair<float,string>(-18.0f,  "-6"));
+					points.insert (std::pair<float,string>(-15.0f,  "-3"));
+					points.insert (std::pair<float,string>(-12.0f,  " 0"));
+					points.insert (std::pair<float,string>( -9.0f,  "+3"));
+					points.insert (std::pair<float,string>( -6.0f,  "+6"));
+					points.insert (std::pair<float,string>( -3.0f,  "+9"));
+					points.insert (std::pair<float,string>(  0.0f, "+12"));
+					break;
 				case MeterK14:
 					overlay_midi = 0;
 					points.insert (std::pair<float,string>(-54.0f, "-40"));
@@ -635,12 +752,15 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 				default:
 				case MeterPeak:
 				case MeterKrms:
+					points.insert (std::pair<float,string>(  3.0f, "+3"));
+					// no break
+				case MeterPeak0dB:
 					points.insert (std::pair<float,string>(-50.0f, "-50"));
 					points.insert (std::pair<float,string>(-40.0f, "-40"));
 					points.insert (std::pair<float,string>(-30.0f, "-30"));
 					points.insert (std::pair<float,string>(-20.0f, "-20"));
 					if (types.size() == 1) {
-						if (Config->get_meter_line_up_level() == MeteringLineUp24) {
+						if (UIConfiguration::instance().get_meter_line_up_level() == MeteringLineUp24) {
 							points.insert (std::pair<float,string>(-24.0f, "-24"));
 						} else {
 							points.insert (std::pair<float,string>(-25.0f, "-25"));
@@ -652,7 +772,6 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					points.insert (std::pair<float,string>( -5.0f, "-5"));
 					points.insert (std::pair<float,string>( -3.0f, "-3"));
 					points.insert (std::pair<float,string>(  0.0f, "+0"));
-					points.insert (std::pair<float,string>(  3.0f, "+3"));
 					break;
 
 				case MeterIEC2EBU:
@@ -685,31 +804,31 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					points.insert (std::pair<float,string>(-42.0f, "-24"));
 					points.insert (std::pair<float,string>(-36.0f, "-18"));
 
-					points.insert (std::pair<float,string>(-33.0f, "-15"));
+					//points.insert (std::pair<float,string>(-33.0f, "-15"));
 					points.insert (std::pair<float,string>(-30.0f, "-12"));
-					points.insert (std::pair<float,string>(-27.0f, "-9"));
+					//points.insert (std::pair<float,string>(-27.0f, "-9"));
 					points.insert (std::pair<float,string>(-24.0f, "-6"));
-					points.insert (std::pair<float,string>(-21.0f, "-3"));
+					//points.insert (std::pair<float,string>(-21.0f, "-3"));
 
 					points.insert (std::pair<float,string>(-18.0f, "TST"));
-					points.insert (std::pair<float,string>(-15.0f, "+3"));
+					//points.insert (std::pair<float,string>(-15.0f, "+3"));
 					points.insert (std::pair<float,string>(-12.0f, "+6"));
 					points.insert (std::pair<float,string>( -9.0f, "+9"));
-					points.insert (std::pair<float,string>( -6.0f, "+12"));
+					//points.insert (std::pair<float,string>( -6.0f, "+12"));
 					break;
 
 				case MeterIEC1DIN:
 					overlay_midi = 2;
 					//points.insert (std::pair<float,string>( -3.0f, "200%"));
-					points.insert (std::pair<float,string>( -4.0f, "+5")); // "100%"
-					points.insert (std::pair<float,string>( -9.0f, "0"));
+					points.insert (std::pair<float,string>( -4.0f, "+5"));
+					points.insert (std::pair<float,string>( -9.0f, "0")); // "100%";
 					points.insert (std::pair<float,string>(-14.0f, "-5"));
 					//points.insert (std::pair<float,string>(-15.0f, "50%"));
 					//points.insert (std::pair<float,string>(-18.0f, "-9"));
 					points.insert (std::pair<float,string>(-19.0f, "-10")); // "30%"
 					points.insert (std::pair<float,string>(-29.0f, "-20")); // "10%"
-					//points.insert (std::pair<float,string>(-35.0f, "-20")); // "5%"
-					points.insert (std::pair<float,string>(-39.0f, "-30")); // "3%"
+					//points.insert (std::pair<float,string>(-35.0f, "5%")); // "5%"
+					points.insert (std::pair<float,string>(-39.0f, "-30"));
 					//points.insert (std::pair<float,string>(-49.0f, "1%"));
 					points.insert (std::pair<float,string>(-59.0f, "-50"));
 					break;
@@ -742,6 +861,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 				points.insert (std::pair<float,string>( 96,  "96"));
 				points.insert (std::pair<float,string>(100, "100"));
 				points.insert (std::pair<float,string>(112, "112"));
+				points.insert (std::pair<float,string>(127, "127"));
 			} else {
 				switch (overlay_midi) {
 					case 1:
@@ -769,6 +889,13 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 						points.insert (std::pair<float,string>( 72, "72"));
 						points.insert (std::pair<float,string>(112, "112"));
 						points.insert (std::pair<float,string>(127, "127"));
+					case 4:
+						/* labels that don't overlay with 0dBFS*/
+						points.insert (std::pair<float,string>(  0, "0"));
+						points.insert (std::pair<float,string>( 16, "16"));
+						points.insert (std::pair<float,string>( 48, "48"));
+						points.insert (std::pair<float,string>( 84, "84"));
+						points.insert (std::pair<float,string>(100, "100"));
 					default:
 						break;
 				}
@@ -776,7 +903,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 			break;
 		}
 
-		gint pos;
+		gint pos = -1;
 
 		for (std::map<float,string>::const_iterator j = points.begin(); j != points.end(); ++j) {
 			float fraction = 0;
@@ -797,23 +924,16 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 						cairo_stroke (cr);
 					}
 					break;
-
 				case DataType::MIDI:
 					align_center = false; // don't bleed into legend
 					fraction = (j->first) / 127.0;
-					pos = 1 + height - (gint) rintf (height * fraction);
+					pos = 1 + height - (gint) lrintf (height * fraction);
 					pos = min (pos, height);
-					cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-					if (tickleft) {
-						cairo_arc(cr, width - 2.0, pos + .5, 1.0, 0, 2 * M_PI);
-						cairo_fill(cr);
-					} else if (tickright) {
-						cairo_arc(cr, 3, pos + .5, 1.0, 0, 2 * M_PI);
-						cairo_fill(cr);
-					}
 					break;
 			}
 
+			if (pos < 0) continue;
+
 			layout->set_text(j->second.c_str());
 
 			int tw, th;
@@ -859,8 +979,12 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					case MeterK14:
 						layout->set_text("K14");
 						break;
+					case MeterK12:
+						layout->set_text("K12");
+						break;
 					default:
 					case MeterPeak:
+					case MeterPeak0dB:
 					case MeterKrms:
 						layout->set_text("dBFS");
 						break;
@@ -886,6 +1010,11 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 				layout->set_text("mid");
 				layout->get_pixel_size(tw, th);
 				break;
+			default: // DataType::NIL;
+				layout->set_text("");
+				tw = th = 0;
+				assert (0); // not reached
+				break;
 		}
 		if (!background) {
 			c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
@@ -970,12 +1099,19 @@ ArdourMeter::meter_expose_metrics (GdkEventExpose *ev, MeterType type, std::vect
 	}
 
 	cairo_move_to (cr, 0, 0);
-	cairo_set_source (cr, pattern);
 
 	gint width, height;
 	win->get_size (width, height);
-
+#ifdef NO_OVERSAMPLE
+	cairo_set_source (cr, pattern);
 	cairo_rectangle (cr, 0, 0, width, height);
+#else
+	cairo_scale(cr, 0.5, 0.5);
+	cairo_set_antialias(cr, CAIRO_ANTIALIAS_BEST);
+	cairo_set_source (cr, pattern);
+	cairo_rectangle (cr, 0, 0, width * 2., height * 2.);
+#endif
+
 	cairo_fill (cr);
 
 	cairo_destroy (cr);