X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_patterns.cc;h=f392dc08725e76f716706b7a403063d379fc8892;hb=616f2a0370a10dcc7372a95f6bca9f5a45698980;hp=756cdcccbd8a7094f603438d638f7b9559d3e6b4;hpb=8b616b075758b5013c65ac89c501b17ca7dc4e49;p=ardour.git

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index 756cdcccbd..f392dc0872 100644
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -52,15 +52,17 @@ sigc::signal<void, int, ARDOUR::RouteGroup*, ARDOUR::MeterType> ArdourMeter::Set
 /* pattern cache */
 
 struct MeterMatricsMapKey {
-	MeterMatricsMapKey (std::string n, MeterType t)
+	MeterMatricsMapKey (std::string n, MeterType t, int dt)
 		: _n(n)
 		, _t(t)
+		, _dt(dt)
 	{}
 	inline bool operator<(const MeterMatricsMapKey& rhs) const {
-		return (_n < rhs._n) || (_n == rhs._n && _t < rhs._t);
+		return (_n < rhs._n) || (_n == rhs._n && _t < rhs._t) || (_n == rhs._n && _t == rhs._t && _dt < rhs._dt);
 	}
 	std::string _n;
 	MeterType _t;
+	int _dt;
 };
 
 namespace ArdourMeter {
@@ -108,6 +110,14 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
 	}
 }
 
+static inline int types_to_bit (vector<ARDOUR::DataType> types) {
+	int rv = 0;
+	for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
+		rv |= 1 << (*i);
+	}
+	return rv;
+}
+
 static inline float mtr_col_and_fract(
 		cairo_t* cr, Gdk::Color const * const c, const uint32_t peakcolor, const MeterType mt, const float val)
 {
@@ -128,23 +138,14 @@ static inline float mtr_col_and_fract(
 			}
 			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) {
-				cairo_set_source_rgb (cr,
-						UINT_RGBA_R_FLT(peakcolor),
-						UINT_RGBA_G_FLT(peakcolor),
-						UINT_RGBA_B_FLT(peakcolor));
-			} else {
-				cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
-			}
+			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),
@@ -152,10 +153,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),
@@ -199,10 +203,24 @@ static inline float mtr_col_and_fract(
 	return fraction;
 }
 
+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) {
+	float r,g,b;
 	switch(type) {
 		case MeterVU:
-			cairo_set_source_rgb (cr, 1.0, 1.0, 0.85);
+			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);
+			}
 			break;
 		case MeterIEC1DIN:
 		case MeterIEC1NOR:
@@ -210,7 +228,11 @@ static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
 		case MeterIEC2EBU:
 		case MeterK14:
 		case MeterK20:
-			cairo_set_source_rgb (cr, 0.1, 0.1, 0.1);
+			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);
+			}
 			break;
 		default:
 			{
@@ -221,13 +243,22 @@ static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
 	}
 }
 
-static void set_fg_color(MeterType type, Gdk::Color * c) {
+static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
+	float r,g,b;
 	switch(type) {
 		case MeterVU:
-			c->set_rgb_p(0.0, 0.0, 0.0);
+			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);
+			}
 			break;
 		default:
-			c->set_rgb_p(1.0, 1.0, 1.0);
+			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);
+			}
 			break;
 	}
 }
@@ -238,11 +269,32 @@ 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;
+	if (tickleft) {
+		if (w.get_name().substr(0, 3) == "Bar") {
+			box_l = width-2; box_w = 2;
+		} else if (w.get_name().substr(0, 4) == "Mark") {
+			box_l = width-2; box_w = 2;
+			background = false;
+		}
+	} else if (tickright) {
+		if (w.get_name().substr(0, 3) == "Bar") {
+			box_l = 0; box_w = 2;
+		} else if (w.get_name().substr(0, 4) == "Mark") {
+			box_l = 0; box_w = 2;
+			background = false;
+		}
+	} else {
+		box_l = 0; box_w = 3;
+	}
 
 	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
 	cairo_t* cr = cairo_create (surface);
@@ -270,12 +322,10 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 			/* we're overlaying more than 1 set of marks, so use different colours */
 			c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
 		} else if (background) {
-			set_fg_color(type, &c);
-			cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+			set_fg_color(w, type, &c);
 		} 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;
@@ -291,10 +341,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:
@@ -304,12 +355,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));
@@ -323,7 +375,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;
@@ -347,44 +399,66 @@ 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));
+					points.insert (std::pair<float,float>(-17.0f, 1.0)); //+3 VU
 					points.insert (std::pair<float,float>(-18.0f, 1.0));
 					points.insert (std::pair<float,float>(-19.0f, 1.0));
-					points.insert (std::pair<float,float>(-20.0f, 1.0));
+					points.insert (std::pair<float,float>(-19.5f, 0.5));
+					points.insert (std::pair<float,float>(-20.0f, 1.0)); // 0 VU
+					points.insert (std::pair<float,float>(-20.5f, 0.5));
 					points.insert (std::pair<float,float>(-21.0f, 1.0));
 					points.insert (std::pair<float,float>(-22.0f, 1.0));
-					points.insert (std::pair<float,float>(-23.0f, 1.0));
+					points.insert (std::pair<float,float>(-23.0f, 1.0)); //-3 VU
+					points.insert (std::pair<float,float>(-24.0f, 0.5));
 					points.insert (std::pair<float,float>(-25.0f, 1.0));
-					points.insert (std::pair<float,float>(-27.0f, 1.0));
+					points.insert (std::pair<float,float>(-26.0f, 0.5));
+					points.insert (std::pair<float,float>(-27.0f, 1.0)); //-7 VU
 					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:
@@ -465,6 +539,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
 				fraction = (j->first) / 127.0;
 				pos = 1 + height - (gint) floor (height * fraction);
 				pos = min (pos, height);
+				cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
 				cairo_arc(cr, 1.5, pos + .5, 1.0, 0, 2 * M_PI);
 				cairo_fill(cr);
 				break;
@@ -487,6 +562,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 
 	bool tickleft, tickright;
 	bool background;
+	int overlay_midi = 1;
 	gint width, height;
 	win->get_size (width, height);
 
@@ -546,50 +622,52 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 
 	height = min(max_pattern_metric_size, height);
 	uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
-	Gdk::Color c;
+	Gdk::Color c; // default text color
 
 	for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
 
+		if (types.size() > 1 && (*i) == DataType::MIDI && overlay_midi == 0) {
+			continue;
+		}
+
 		if (types.size() > 1 && (*i) == DataType::MIDI) {
 			/* we're overlaying more than 1 set of marks, so use different colours */
 			c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
 		} else if (background) {
-			set_fg_color(type, &c);
-			cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+			set_fg_color(w, type, &c);
 		} 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());
 
-
-		// label-pos in dBFS, label-text
-		std::map<float,string> points;
+		std::map<float,string> points; // map: label-pos in dBFS, label-text
 
 		switch (*i) {
 		case DataType::AUDIO:
 			layout->set_attributes (audio_font_attributes);
 			switch (type) {
 				case MeterK14:
+					overlay_midi = 0;
 					points.insert (std::pair<float,string>(-54.0f, "-40"));
 					points.insert (std::pair<float,string>(-44.0f, "-30"));
 					points.insert (std::pair<float,string>(-34.0f, "-20"));
 					points.insert (std::pair<float,string>(-24.0f, "-10"));
 					points.insert (std::pair<float,string>(-20.0f,  "-6"));
 					points.insert (std::pair<float,string>(-17.0f,  "-3"));
-					points.insert (std::pair<float,string>(-14.0f,   "0"));
+					points.insert (std::pair<float,string>(-14.0f,  " 0"));
 					points.insert (std::pair<float,string>(-11.0f,  "+3"));
 					points.insert (std::pair<float,string>( -8.0f,  "+6"));
 					points.insert (std::pair<float,string>( -4.0f, "+10"));
 					points.insert (std::pair<float,string>(  0.0f, "+14"));
 					break;
 				case MeterK20:
+					overlay_midi = 0;
 					points.insert (std::pair<float,string>(-60.0f, "-40"));
 					points.insert (std::pair<float,string>(-50.0f, "-30"));
 					points.insert (std::pair<float,string>(-40.0f, "-20"));
 					points.insert (std::pair<float,string>(-30.0f, "-10"));
 					points.insert (std::pair<float,string>(-26.0f,  "-6"));
 					points.insert (std::pair<float,string>(-23.0f,  "-3"));
-					points.insert (std::pair<float,string>(-20.0f,   "0"));
+					points.insert (std::pair<float,string>(-20.0f,  " 0"));
 					points.insert (std::pair<float,string>(-17.0f,  "+3"));
 					points.insert (std::pair<float,string>(-14.0f,  "+6"));
 					points.insert (std::pair<float,string>(-10.0f, "+10"));
@@ -620,6 +698,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					break;
 
 				case MeterIEC2EBU:
+					overlay_midi = 3;
 					points.insert (std::pair<float,string>(-30.0f, "-12"));
 					points.insert (std::pair<float,string>(-26.0f, "-8"));
 					points.insert (std::pair<float,string>(-22.0f, "-4"));
@@ -630,6 +709,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					break;
 
 				case MeterIEC2BBC:
+					overlay_midi = 3;
 					points.insert (std::pair<float,string>(-30.0f, " 1 "));
 					points.insert (std::pair<float,string>(-26.0f, " 2 "));
 					points.insert (std::pair<float,string>(-22.0f, " 3 "));
@@ -640,45 +720,48 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					break;
 
 				case MeterIEC1NOR:
+					overlay_midi = 0;
 					//points.insert (std::pair<float,string>(-60.0f, "-42"));
 					points.insert (std::pair<float,string>(-54.0f, "-36"));
 					points.insert (std::pair<float,string>(-48.0f, "-30"));
 					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;
 
 				case MeterVU:
+					overlay_midi = 0;
 					points.insert (std::pair<float,string>(-17.0f, "+3"));
 					points.insert (std::pair<float,string>(-18.0f, "+2"));
 					points.insert (std::pair<float,string>(-19.0f, "+1"));
-					points.insert (std::pair<float,string>(-20.0f, "0"));
+					points.insert (std::pair<float,string>(-20.0f, " 0"));
 					points.insert (std::pair<float,string>(-21.0f, "-1"));
 					points.insert (std::pair<float,string>(-22.0f, "-2"));
 					points.insert (std::pair<float,string>(-23.0f, "-3"));
@@ -691,8 +774,8 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 			break;
 		case DataType::MIDI:
 			layout->set_attributes (midi_font_attributes);
-			points.insert (std::pair<float,string>(  0, "0"));
 			if (types.size() == 1) {
+				points.insert (std::pair<float,string>(  0, "0"));
 				points.insert (std::pair<float,string>( 16,  "16"));
 				points.insert (std::pair<float,string>( 32,  "32"));
 				points.insert (std::pair<float,string>( 48,  "48"));
@@ -702,16 +785,40 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 				points.insert (std::pair<float,string>(100, "100"));
 				points.insert (std::pair<float,string>(112, "112"));
 			} else {
-				/* labels that don't overlay with dB */
-				points.insert (std::pair<float,string>( 24, "24"));
-				points.insert (std::pair<float,string>( 48, "48"));
-				points.insert (std::pair<float,string>( 72, "74"));
+				switch (overlay_midi) {
+					case 1:
+						/* labels that don't overlay with dBFS */
+						points.insert (std::pair<float,string>(  0, "0"));
+						points.insert (std::pair<float,string>( 24, "24"));
+						points.insert (std::pair<float,string>( 48, "48"));
+						points.insert (std::pair<float,string>( 72, "72"));
+						points.insert (std::pair<float,string>(127, "127"));
+						break;
+					case 2:
+						/* labels that don't overlay with DIN */
+						points.insert (std::pair<float,string>(  0, "0"));
+						points.insert (std::pair<float,string>( 16,  "16"));
+						points.insert (std::pair<float,string>( 40,  "40"));
+						points.insert (std::pair<float,string>( 64,  "64"));
+						points.insert (std::pair<float,string>(112, "112"));
+						points.insert (std::pair<float,string>(127, "127"));
+						break;
+					case 3:
+						/* labels that don't overlay with BBC nor EBU*/
+						points.insert (std::pair<float,string>(  0, "0"));
+						points.insert (std::pair<float,string>( 16, "16"));
+						points.insert (std::pair<float,string>( 56, "56"));
+						points.insert (std::pair<float,string>( 72, "72"));
+						points.insert (std::pair<float,string>(112, "112"));
+						points.insert (std::pair<float,string>(127, "127"));
+					default:
+						break;
+				}
 			}
-			points.insert (std::pair<float,string>(127, "127"));
 			break;
 		}
 
-		gint pos;
+		gint pos = -1;
 
 		for (std::map<float,string>::const_iterator j = points.begin(); j != points.end(); ++j) {
 			float fraction = 0;
@@ -738,6 +845,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					fraction = (j->first) / 127.0;
 					pos = 1 + height - (gint) rintf (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);
@@ -748,6 +856,8 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 					break;
 			}
 
+			if (pos < 0) continue;
+
 			layout->set_text(j->second.c_str());
 
 			int tw, th;
@@ -762,12 +872,26 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
 			} else {
 				cairo_move_to (cr, width-3-tw, p);
 			}
+
+			cairo_set_line_width(cr, 0.12);
+			cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+			pango_cairo_layout_path(cr, layout->gobj());
+			cairo_stroke_preserve (cr);
+			cairo_set_line_width(cr, 1.0);
+
+			if ((*i) == DataType::AUDIO) {
+				mtr_col_and_fract(cr, &c, peakcolor, type, j->first);
+			} else {
+				cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+			}
+
 			pango_cairo_show_layout (cr, layout->gobj());
+			cairo_new_path(cr);
 		}
 	}
 
 	// add legend
-	if (types.size() == 1) {
+	if (types.size() == 1 || overlay_midi == 0) {
 		int tw, th;
 		layout->set_attributes (unit_font_attributes);
 		switch (types.at(0)) {
@@ -841,7 +965,7 @@ ArdourMeter::meter_expose_ticks (GdkEventExpose *ev, MeterType type, std::vector
 	cairo_clip (cr);
 
 	cairo_pattern_t* pattern;
-	const MeterMatricsMapKey key (mta->get_name(), type);
+	const MeterMatricsMapKey key (mta->get_name(), type, types_to_bit(types));
 	MetricPatternMap::iterator i = ticks_patterns.find (key);
 
 	if (i == ticks_patterns.end()) {
@@ -879,7 +1003,7 @@ ArdourMeter::meter_expose_metrics (GdkEventExpose *ev, MeterType type, std::vect
 	cairo_clip (cr);
 
 	cairo_pattern_t* pattern;
-	const MeterMatricsMapKey key (mma->get_name(), type);
+	const MeterMatricsMapKey key (mma->get_name(), type, types_to_bit(types));
 	MetricPatternMap::iterator i = metric_patterns.find (key);
 
 	if (i == metric_patterns.end()) {