X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=db96a3cb7f7fcc7799e52efcf827d6a922b81f57;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=8fde670c59b7abe95d6336114423153706407b26;hpb=1d964e27f4c927c9ea16d9ee48cd9ab713492330;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 8fde670c59..db96a3cb7f 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -34,20 +34,21 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/rgb_macros.h>
 
-#include "ardour_ui.h"
-#include "global_signals.h"
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "ardour_window.h"
+#include "tooltips.h"
+#include "ui_config.h"
 #include "utils.h"
 
 #include "meterbridge.h"
 #include "meter_strip.h"
 #include "meter_patterns.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;
@@ -58,21 +59,26 @@ PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
 PBD::Signal0<void> MeterStrip::MetricChanged;
 PBD::Signal0<void> MeterStrip::ConfigurationChanged;
 
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
+
 MeterStrip::MeterStrip (int metricmode, MeterType mt)
-	: AxisView(0)
-	, RouteUI(0)
+	: RouteUI ((Session*) 0)
 {
 	level_meter = 0;
 	_strip_type = 0;
-	mtr_vbox.set_spacing(2);
-	nfo_vbox.set_spacing(2);
-	peakbx.set_size_request(-1, 14);
-	namebx.set_size_request(18, 52);
-	spacer.set_size_request(-1,0);
+	_tick_bar = 0;
+	_metricmode = -1;
+	metric_type = MeterPeak;
+
+	mtr_vbox.set_spacing (PX_SCALE(2, 2));
+	nfo_vbox.set_spacing (PX_SCALE(2, 2));
+	peakbx.set_size_request (-1, PX_SCALE(14, 14));
+	namebx.set_size_request (PX_SCALE(16, 18), PX_SCALE(32, 52));
+	spacer.set_size_request (-1,0);
 
 	set_metric_mode(metricmode, mt);
 
-	meter_metric_area.set_size_request(25, 10);
+	meter_metric_area.set_size_request (PX_SCALE(25, 25), 10);
 	meter_metric_area.signal_expose_event().connect (
 			sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose));
 	RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
@@ -84,7 +90,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	mtr_vbox.pack_start (spacer, false, false);
 	mtr_container.add(mtr_vbox);
 
-	mtr_hsep.set_size_request(-1,1);
+	mtr_hsep.set_size_request (-1, 1);
 	mtr_hsep.set_name("BlackSeparator");
 
 	nfo_vbox.pack_start (mtr_hsep, false, false);
@@ -105,23 +111,28 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	nfo_vbox.show();
 
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
-	ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
-	DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
 }
 
 MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
-	: AxisView(sess)
-	, RouteUI(sess)
+	: SessionHandlePtr (sess)
+	, RouteUI(0)
 	, _route(rt)
 	, peak_display()
 {
-	mtr_vbox.set_spacing(2);
-	nfo_vbox.set_spacing(2);
-	RouteUI::set_route (rt);
+	mtr_vbox.set_spacing (PX_SCALE(2, 2));
+	nfo_vbox.set_spacing (PX_SCALE(2, 2));
 	SessionHandlePtr::set_session (sess);
+	RouteUI::init ();
+	RouteUI::set_route (rt);
 
 	_has_midi = false;
+	_tick_bar = 0;
+	_metricmode = -1;
+	metric_type = MeterPeak;
 
+	// note: level_meter->setup_meters() does the scaling
 	int meter_width = 6;
 	if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
 		meter_width = 12;
@@ -146,29 +157,50 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	// peak display
 	peak_display.set_name ("meterbridge peakindicator");
 	peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+	set_tooltip (peak_display, _("Reset Peak"));
 	max_peak = minus_infinity();
 	peak_display.unset_flags (Gtk::CAN_FOCUS);
-	peak_display.set_size_request(12, 8);
-	peak_display.set_corner_radius(2);
+	peak_display.set_size_request(PX_SCALE(12, 12), PX_SCALE(8, 8));
+	peak_display.set_corner_radius(2); // ardour-button scales this
 
 	peak_align.set(0.5, 1.0, 1.0, 0.8);
 	peak_align.add(peak_display);
-	peakbx.pack_start(peak_align, true, true, 3);
-	peakbx.set_size_request(-1, 14);
+	peakbx.pack_start(peak_align, true, true, 2);
+	peakbx.set_size_request(-1, PX_SCALE(14, 14));
 
-	// add track-name label
-	name_label.set_text(_route->name());
-	name_label.set_corner_radius(2);
+	// add track-name & -number label
+	number_label.set_text("-");
+	number_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(18, 18));
+
+	name_changed();
+
+	name_label.set_corner_radius(2); // ardour button scales radius
+	name_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
 	name_label.set_name("meterbridge label");
 	name_label.set_angle(-90.0);
-	name_label.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
-	name_label.layout()->set_width(48 * PANGO_SCALE);
-	name_label.set_size_request(18, 50);
+	name_label.set_text_ellipsize (Pango::ELLIPSIZE_END);
+	name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
+	name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
 	name_label.set_alignment(-1.0, .5);
-	ARDOUR_UI::instance()->set_tip (name_label, _route->name());
-
-	namebx.set_size_request(18, 52);
-	namebx.pack_start(name_label, true, false, 3);
+	set_tooltip (name_label, _route->name());
+	set_tooltip (*level_meter, _route->name());
+
+	number_label.set_corner_radius(2);
+	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
+	number_label.set_name("tracknumber label");
+	number_label.set_angle(-90.0);
+	number_label.set_layout_ellipsize_width(18 * PANGO_SCALE);
+	number_label.set_alignment(.5, .5);
+
+	namebx.set_size_request(PX_SCALE(18, 18), PX_SCALE(52, 52));
+	namebx.pack_start(namenumberbx, true, false, 0);
+	namenumberbx.pack_start(name_label, true, false, 0);
+	namenumberbx.pack_start(number_label, false, false, 0);
+
+	mon_in_box.pack_start(*monitor_input_button, true, false);
+	btnbox.pack_start(mon_in_box, false, false, 1);
+	mon_disk_box.pack_start(*monitor_disk_button, true, false);
+	btnbox.pack_start(mon_disk_box, false, false, 1);
 
 	recbox.pack_start(*rec_enable_button, true, false);
 	btnbox.pack_start(recbox, false, false, 1);
@@ -178,17 +210,25 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	btnbox.pack_start(solobox, false, false, 1);
 
 	rec_enable_button->set_corner_radius(2);
-	rec_enable_button->set_size_request(16, 16);
+	rec_enable_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	mute_button->set_corner_radius(2);
-	mute_button->set_size_request(16, 16);
+	mute_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	solo_button->set_corner_radius(2);
-	solo_button->set_size_request(16, 16);
+	solo_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+
+	monitor_input_button->set_corner_radius(2);
+	monitor_input_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
-	mutebox.set_size_request(16, 16);
-	solobox.set_size_request(16, 16);
-	recbox.set_size_request(16, 16);
+	monitor_disk_button->set_corner_radius(2);
+	monitor_disk_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+
+	mutebox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	solobox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	recbox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	mon_in_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	mon_disk_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 	spacer.set_size_request(-1,0);
 
 	update_button_box();
@@ -225,9 +265,18 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	mtr_container.show();
 	mtr_hsep.show();
 	nfo_vbox.show();
+	namenumberbx.show();
+
+	if (boost::dynamic_pointer_cast<Track>(_route)) {
+		monitor_input_button->show();
+		monitor_disk_button->show();
+	} else {
+		monitor_input_button->hide();
+		monitor_disk_button->hide();
+	}
 
 	_route->shared_peak_meter()->ConfigurationChanged.connect (
-			route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
+			meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
 			);
 
 	ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
@@ -238,19 +287,19 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 	meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
 
-	meter_ticks1_area.set_size_request(3,-1);
-	meter_ticks2_area.set_size_request(3,-1);
+	meter_ticks1_area.set_size_request(PX_SCALE(3, 3), -1);
+	meter_ticks2_area.set_size_request(PX_SCALE(3, 3), -1);
 	meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose));
 	meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
 
-	_route->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
-	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
+	_route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
 
 	peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false);
+	name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
 
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
-	ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
-	DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
 	Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 	sess->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 
@@ -272,8 +321,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 MeterStrip::~MeterStrip ()
 {
-	delete level_meter;
-	CatchDeletion (this);
+	if (level_meter) {
+		delete level_meter;
+		CatchDeletion (this);
+	}
 }
 
 void
@@ -293,64 +344,77 @@ MeterStrip::set_session (Session* s)
 }
 
 void
-MeterStrip::update_rec_display ()
+MeterStrip::blink_rec_display (bool onoff)
 {
-	RouteUI::update_rec_display ();
+	RouteUI::blink_rec_display (onoff);
 }
 
 std::string
 MeterStrip::state_id() const
 {
-	return string_compose ("mtrs %1", _route->id().to_s());
+	if (_route) {
+		return string_compose ("mtrs %1", _route->id().to_s());
+	} else {
+		return string ();
+	}
 }
 
 void
 MeterStrip::set_button_names()
 {
-	mute_button->set_text (_("M"));
-	rec_enable_button->set_text ("");
-	rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+	mute_button->set_text (S_("Mute|M"));
 
-	if (_route && _route->solo_safe()) {
+	if (_route && _route->solo_safe_control()->solo_safe()) {
 		solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
 	} else {
 		solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
 	}
 	if (!Config->get_solo_control_is_listen_control()) {
-		solo_button->set_text (_("S"));
+		solo_button->set_text (S_("Solo|S"));
 	} else {
 		switch (Config->get_listen_position()) {
 		case AfterFaderListen:
-			solo_button->set_text (_("A"));
+			solo_button->set_text (S_("AfterFader|A"));
 			break;
 		case PreFaderListen:
-			solo_button->set_text (_("P"));
+			solo_button->set_text (S_("PreFader|P"));
 			break;
 		}
 	}
 
+	monitor_input_button->set_text (S_("MonitorInput|I"));
+	monitor_disk_button->set_text (S_("MonitorDisk|D"));
 }
 
 void
-MeterStrip::strip_property_changed (const PropertyChange& what_changed)
+MeterStrip::route_property_changed (const PropertyChange& what_changed)
 {
 	if (!what_changed.contains (ARDOUR::Properties::name)) {
 		return;
 	}
-	ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
-	name_label.set_text(_route->name());
-	ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+	ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
+	name_changed();
+	set_tooltip (name_label, _route->name());
+	if (level_meter) {
+		set_tooltip (*level_meter, _route->name());
+	}
+}
+
+void
+MeterStrip::route_color_changed ()
+{
+	number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
 }
 
+
 void
 MeterStrip::fast_update ()
 {
 	float mpeak = level_meter->update_meters();
 	if (mpeak > max_peak) {
 		max_peak = mpeak;
-		if (mpeak >= Config->get_meter_peak()) {
-			peak_display.set_name ("meterbridge peakindicator on");
-			peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+		if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
+			peak_display.set_active_state ( Gtkmm2ext::ExplicitActive );
 		}
 	}
 }
@@ -384,13 +448,13 @@ MeterStrip::meter_configuration_changed (ChanCount c)
 	if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
 			&& boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
 			) {
-		meter_ticks1_area.set_name ("AudioBusMetricsLeft");
-		meter_ticks2_area.set_name ("AudioBusMetricsRight");
+		meter_ticks1_area.set_name ("MyAudioBusMetricsLeft");
+		meter_ticks2_area.set_name ("MyAudioBusMetricsRight");
 		_has_midi = false;
 	}
 	else if (type == (1 << DataType::AUDIO)) {
-		meter_ticks1_area.set_name ("AudioTrackMetricsLeft");
-		meter_ticks2_area.set_name ("AudioTrackMetricsRight");
+		meter_ticks1_area.set_name ("MyAudioTrackMetricsLeft");
+		meter_ticks2_area.set_name ("MyAudioTrackMetricsRight");
 		_has_midi = false;
 	}
 	else if (type == (1 << DataType::MIDI)) {
@@ -402,12 +466,42 @@ MeterStrip::meter_configuration_changed (ChanCount c)
 		meter_ticks2_area.set_name ("AudioMidiTrackMetricsRight");
 		_has_midi = true;
 	}
+	set_tick_bar(_tick_bar);
 
 	on_theme_changed();
 	if (old_has_midi != _has_midi) MetricChanged();
 	else ConfigurationChanged();
 }
 
+void
+MeterStrip::set_tick_bar (int m)
+{
+	std::string n;
+	_tick_bar = m;
+	if (_tick_bar & 1) {
+		n = meter_ticks1_area.get_name();
+		if (n.substr(0,3) != "Bar") {
+			meter_ticks1_area.set_name("Bar" + n);
+		}
+	} else {
+		n = meter_ticks1_area.get_name();
+		if (n.substr(0,3) == "Bar") {
+			meter_ticks1_area.set_name(n.substr(3,-1));
+		}
+	}
+	if (_tick_bar & 2) {
+		n = meter_ticks2_area.get_name();
+		if (n.substr(0,3) != "Bar") {
+			meter_ticks2_area.set_name("Bar" + n);
+		}
+	} else {
+		n = meter_ticks2_area.get_name();
+		if (n.substr(0,3) == "Bar") {
+			meter_ticks2_area.set_name(n.substr(3,-1));
+		}
+	}
+}
+
 void
 MeterStrip::on_size_request (Gtk::Requisition* r)
 {
@@ -418,15 +512,73 @@ void
 MeterStrip::on_size_allocate (Gtk::Allocation& a)
 {
 	const int wh = a.get_height();
-	int nh = ceilf(wh * .11f);
-	if (nh < 52) nh = 52;
-	if (nh > 148) nh = 148;
-	namebx.set_size_request(18, nh);
+	int nh;
+	int mh = 0;
+	if (_session) {
+		mh = _session->config.get_meterbridge_label_height();
+	}
+	switch (mh) {
+		default:
+		case 0:
+			nh = ceilf(wh * .12f);
+			if (nh < 52) nh = 52;
+			if (nh > 148) nh = 148;
+			break;
+		case 1:
+			nh = 52;
+			break;
+		case 2:
+			nh = 88;
+			break;
+		case 3:
+			nh = 106;
+			break;
+		case 4:
+			nh = 148;
+			break;
+	}
+	int tnh = 0;
+	if (_session && _session->config.get_track_name_number()) {
+		// NB numbers are rotated 90deg. on the meterbridge
+		tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9()
+	}
+
+	nh *= UIConfiguration::instance().get_ui_scale();
+	tnh *= UIConfiguration::instance().get_ui_scale();
+
+	int prev_height, ignored;
+	bool need_relayout = false;
+
+	namebx.get_size_request (ignored, prev_height);
+	namebx.set_size_request (PX_SCALE(18, 18), nh + tnh);
+
+	if (prev_height != nh + tnh) {
+		need_relayout = true;
+	}
+
+	namenumberbx.get_size_request (ignored, prev_height);
+	namenumberbx.set_size_request (PX_SCALE(18, 18), nh + tnh);
+
+	if (prev_height != nh + tnh) {
+		need_relayout = true;
+	}
+
 	if (_route) {
-		name_label.set_size_request(18, nh-2);
-		name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+		int nlh = nh + (_route->is_master() ? tnh : -1);
+		name_label.get_size_request(ignored, prev_height);
+		name_label.set_size_request (PX_SCALE(18, 18), nlh);
+		name_label.set_layout_ellipsize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE); // XXX
+		if (prev_height != nlh) {
+			need_relayout = true;
+		}
 	}
+
 	VBox::on_size_allocate(a);
+
+	if (need_relayout) {
+		queue_resize();
+		MetricChanged(); // force re-layout, parent on_scroll(), queue_resize()
+	}
 }
 
 gint
@@ -442,7 +594,12 @@ MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
 void
 MeterStrip::set_metric_mode (int metricmode, ARDOUR::MeterType mt)
 {
+	if (metric_type == mt && _metricmode == metricmode) {
+		return;
+	}
 	metric_type = mt;
+	_metricmode = metricmode;
+
 	_types.clear ();
 	switch(metricmode) {
 		case 0:
@@ -475,6 +632,7 @@ MeterStrip::update_background(MeterType type)
 		case MeterIEC1NOR:
 		case MeterIEC2BBC:
 		case MeterIEC2EBU:
+		case MeterK12:
 		case MeterK14:
 		case MeterK20:
 			mtr_container.set_name ("meterstripPPM");
@@ -531,8 +689,7 @@ MeterStrip::reset_peak_display ()
 	_route->shared_peak_meter()->reset_max();
 	level_meter->clear_meters();
 	max_peak = -INFINITY;
-	peak_display.set_name ("meterbridge peakindicator");
-	peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+	peak_display.set_active_state ( Gtkmm2ext::Off );
 }
 
 bool
@@ -547,7 +704,7 @@ MeterStrip::peak_button_release (GdkEventButton* ev)
 	} else {
 		ResetRoutePeakDisplays (_route.get());
 	}
-	return true;
+	return false;
 }
 
 void
@@ -564,24 +721,33 @@ MeterStrip::update_button_box ()
 	if (!_session) return;
 	int height = 0;
 	if (_session->config.get_show_mute_on_meterbridge()) {
-		height += 18;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		mutebox.show();
 	} else {
 		mutebox.hide();
 	}
 	if (_session->config.get_show_solo_on_meterbridge()) {
-		height += 18;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		solobox.show();
 	} else {
 		solobox.hide();
 	}
 	if (_session->config.get_show_rec_on_meterbridge()) {
-		height += 18;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		recbox.show();
 	} else {
 		recbox.hide();
 	}
-	btnbox.set_size_request(16, height);
+	if (_session->config.get_show_monitor_on_meterbridge()) {
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
+		mon_in_box.show();
+		mon_disk_box.show();
+	} else {
+		mon_in_box.hide();
+		mon_disk_box.hide();
+	}
+	btnbox.set_size_request(PX_SCALE(18, 18), height);
 	check_resize();
 }
 
@@ -614,14 +780,48 @@ MeterStrip::parameter_changed (std::string const & p)
 	else if (p == "show-name-on-meterbridge") {
 		update_name_box();
 	}
+	else if (p == "show-monitor-on-meterbridge") {
+		update_button_box();
+	}
+	else if (p == "meterbridge-label-height") {
+		queue_resize();
+	}
+	else if (p == "track-name-number") {
+		name_changed();
+		queue_resize();
+	}
 }
 
+void
+MeterStrip::name_changed () {
+	if (!_route) {
+		return;
+	}
+	name_label.set_text(_route->name ());
+	if (_session && _session->config.get_track_name_number()) {
+		const uint64_t track_number = _route->track_number();
+		if (track_number == 0) {
+			number_label.set_text("-");
+			number_label.hide();
+		} else {
+			number_label.set_text (PBD::to_string (track_number, std::dec));
+			number_label.show();
+		}
+		const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
+		// NB numbers are rotated 90deg. on the meterbridge -> use height
+		number_label.set_size_request(PX_SCALE(18, 18), tnh * UIConfiguration::instance().get_ui_scale());
+	} else {
+		number_label.hide();
+	}
+}
 
 bool
 MeterStrip::level_meter_button_press (GdkEventButton* ev)
 {
 	if (ev->button == 3) {
-		popup_level_meter_menu (ev);
+		if (_route && _route->shared_peak_meter()->input_streams ().n_audio() > 0) {
+			popup_level_meter_menu (ev);
+		}
 		return true;
 	}
 
@@ -639,15 +839,17 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
 	RadioMenuItem::Group group;
 
 	_suspend_menu_callbacks = true;
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
-	add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterVU),  MeterVU);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK12), MeterK12);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterVU),  MeterVU);
 
 	MeterType cmt = _route->meter_type();
 	const std::string cmn = ArdourMeter::meter_type_string(cmt);
@@ -664,8 +866,53 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
 	_suspend_menu_callbacks = false;
 }
 
+bool
+MeterStrip::name_label_button_release (GdkEventButton* ev)
+{
+	if (!_session) return true;
+	if (!_session->config.get_show_name_on_meterbridge()) return true;
+
+	if (ev->button == 3) {
+		popup_name_label_menu (ev);
+		return true;
+	}
+
+	return false;
+}
+
+void
+MeterStrip::popup_name_label_menu (GdkEventButton* ev)
+{
+	using namespace Gtk::Menu_Helpers;
+
+	Gtk::Menu* m = manage (new Menu);
+	MenuList& items = m->items ();
+
+	RadioMenuItem::Group group;
+
+	_suspend_menu_callbacks = true;
+	add_label_height_item (items, group, _("Variable height"), 0);
+	add_label_height_item (items, group, _("Short"), 1);
+	add_label_height_item (items, group, _("Tall"), 2);
+	add_label_height_item (items, group, _("Grande"), 3);
+	add_label_height_item (items, group, _("Venti"), 4);
+
+	m->popup (ev->button, ev->time);
+	_suspend_menu_callbacks = false;
+}
+
+void
+MeterStrip::add_label_height_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, uint32_t h)
+{
+	using namespace Menu_Helpers;
+
+	items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MeterStrip::set_label_height), h)));
+	RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+	i->set_active (_session && _session->config.get_meterbridge_label_height() == h);
+}
+
 void
-MeterStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
+MeterStrip::add_level_meter_type_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
 {
 	using namespace Menu_Helpers;
 
@@ -678,9 +925,18 @@ void
 MeterStrip::set_meter_type (MeterType type)
 {
 	if (_suspend_menu_callbacks) return;
+	if (_route->meter_type() == type) return;
+
 	level_meter->set_type (type);
 }
 
+void
+MeterStrip::set_label_height (uint32_t h)
+{
+	if (_suspend_menu_callbacks) return;
+	_session->config.set_meterbridge_label_height(h);
+}
+
 void
 MeterStrip::meter_type_changed (MeterType type)
 {
@@ -709,3 +965,16 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
 			break;
 	}
 }
+
+string
+MeterStrip::name () const
+{
+	return _route->name();
+}
+
+Gdk::Color
+MeterStrip::color () const
+{
+	return RouteUI::route_color ();
+}
+