X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=831c5158b83a6aa7d74a62d37ebb82f98085a719;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=2f73cb9866f612abb4131fb2e4a9cd1a84bc5c7b;hpb=7cd7927f0a9ab8591ec82cd756187536fe782346;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2f73cb9866..831c5158b8 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -80,8 +80,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
 
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
-static const int _button_vpad = 4;
-
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	: AxisView(sess)
 	, RouteUI (sess)
@@ -91,7 +89,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, gpm (sess, 250)
 	, panners (sess)
 	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-	, button_table (3, 1)
 	, rec_mon_table (2, 2)
 	, solo_iso_table (1, 2)
 	, mute_solo_table (1, 2)
@@ -121,7 +118,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, gpm (sess, 250)
 	, panners (sess)
 	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-	, button_table (3, 1)
 	, rec_mon_table (2, 2)
 	, solo_iso_table (1, 2)
 	, mute_solo_table (1, 2)
@@ -138,11 +134,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 void
 MixerStrip::init ()
 {
-	int button_table_row = 0;
-
 	_entered_mixer_strip= 0;
-	input_selector = 0;
-	output_selector = 0;
 	group_menu = 0;
 	route_ops_menu = 0;
 	ignore_comment_edit = false;
@@ -165,25 +157,18 @@ MixerStrip::init ()
 	hide_button.set_image(::get_icon("hide"));
 	ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
+	input_button_box.set_spacing(2);
+	
 	input_button.set_text (_("Input"));
 	input_button.set_name ("mixer strip button");
-	input_button.set_size_request (-1, 20);
 	input_button_box.pack_start (input_button, true, true);
-	Gtkmm2ext::set_height_request_to_display_any_text (input_button, _button_vpad);
 
 	output_button.set_text (_("Output"));
 	output_button.set_name ("mixer strip button");
-	Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
-	Gtkmm2ext::set_height_request_to_display_any_text (output_button, _button_vpad);
 
 	ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
 	meter_point_button.set_name ("mixer strip button");
 
-	/* TRANSLATORS: this string should be longest of the strings
-	   used to describe meter points. In english, it's "input".
-	*/
-	set_size_request_to_display_given_text_width (meter_point_button, _("tupni"), 2, _button_vpad);
-
 	bottom_button_table.attach (meter_point_button, 2, 3, 0, 1);
 
 	meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
@@ -191,29 +176,24 @@ MixerStrip::init ()
 	
 	hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-	monitor_input_button->set_diameter (3);
-	monitor_disk_button->set_diameter (3);
-
-        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (3);
-        solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("solo isolate"));
-        solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
+	solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+	solo_isolated_led->show ();
+	solo_isolated_led->set_no_show_all (true);
+	solo_isolated_led->set_name (X_("solo isolate"));
+	solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
 	UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_safe_led->show ();
-        solo_safe_led->set_diameter (3);
-        solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("solo safe"));
-        solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
+	solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+	solo_safe_led->show ();
+	solo_safe_led->set_no_show_all (true);
+	solo_safe_led->set_name (X_("solo safe"));
+	solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
 	UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-	solo_safe_led->set_text (_("lock"));
-	solo_isolated_led->set_text (_("iso"));
+	solo_safe_led->set_text (_("Lock"));
+	solo_isolated_led->set_text (_("Iso"));
 
 	solo_iso_table.set_homogeneous (true);
 	solo_iso_table.set_spacings (2);
@@ -236,9 +216,6 @@ MixerStrip::init ()
 	}
 	rec_mon_table.show ();
 
-	button_table.set_homogeneous (false);
-	button_table.set_spacings (2);
-
 	if (solo_isolated_led) {
 		button_size_group->add_widget (*solo_isolated_led);
 	}
@@ -258,15 +235,6 @@ MixerStrip::init ()
 		}
 	}
 	
-	if (!ARDOUR::Profile->get_trx()) {
-		button_table.attach (name_button, 0, 2, button_table_row, button_table_row+1);
-		button_table_row++;
-		button_table.attach (input_button_box, 0, 2, button_table_row, button_table_row+1);
-		button_table_row++;
-		button_table.attach (_invert_button_box, 0, 2, button_table_row, button_table_row+1);
-		button_table_row++;
-	}
-
 	mute_solo_table.set_homogeneous (true);
 	mute_solo_table.set_spacings (2);
 
@@ -276,20 +244,14 @@ MixerStrip::init ()
 	bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
 
 	name_button.set_name ("mixer strip button");
-	name_button.set_text (" "); /* non empty text, forces creation of the layout */
-	name_button.set_text (""); /* back to empty */
-	name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+	name_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
 	name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
-	name_button.set_size_request (-1, 20);
-	Gtkmm2ext::set_height_request_to_display_any_text (name_button, _button_vpad);
 
 	ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
 	group_button.set_name ("mixer strip button");
-	Gtkmm2ext::set_size_request_to_display_given_text_width (group_button, "Grp", 2, _button_vpad);
 
 	_comment_button.set_name (X_("mixer strip button"));
 	_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
-	Gtkmm2ext::set_size_request_to_display_given_text_width (_comment_button, "Cmt", 2, _button_vpad);
 
 	global_vpacker.set_border_width (1);
 	global_vpacker.set_spacing (0);
@@ -307,15 +269,19 @@ MixerStrip::init ()
 	width_hide_box.pack_end (hide_button, false, true);
 
 	number_label.set_text ("-");
+	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
 	number_label.set_no_show_all ();
 	number_label.set_name ("tracknumber label");
 	number_label.set_fixed_colors (0x80808080, 0x80808080);
 	number_label.set_alignment (.5, .5);
+	number_label.set_fallthrough_to_parent (true);
 
 	global_vpacker.set_spacing (2);
 	if (!ARDOUR::Profile->get_trx()) {
 		global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (processor_box, true, true);
 	}
 	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
@@ -349,12 +315,16 @@ MixerStrip::init ()
 	_session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
 
 	input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
-	output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+	input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false);
 
-	/* ditto for this button and busses */
+	output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+	output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false);
 
 	number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
+
 	name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
+	name_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_release), false);
+
 	group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
 	_width = (Width) -1;
@@ -414,13 +384,10 @@ MixerStrip::~MixerStrip ()
 
 	if (this ==_entered_mixer_strip)
 		_entered_mixer_strip = NULL;
-
-	delete input_selector;
-	delete output_selector;
 }
 
 bool
-MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev)
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
 {
 	_entered_mixer_strip = this;
 	
@@ -484,12 +451,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	mute_changed (0);
 	update_solo_display ();
 
-	delete input_selector;
-	input_selector = 0;
-
-	delete output_selector;
-	output_selector = 0;
-
 	revert_to_default_display ();
 
 	/* unpack these from the parent and stuff them into our own
@@ -506,7 +467,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	gpm.set_type (rt->meter_type());
 	
 	mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
-	mute_solo_table.attach (gpm.peak_display,1,2,1,2);
+	mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
 	if (solo_button->get_parent()) {
 		mute_solo_table.remove (*solo_button);
@@ -521,6 +482,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		solo_button->hide ();
 		mute_button->show ();
 		rec_mon_table.hide ();
+		if (solo_iso_table.get_parent()) {
+			solo_iso_table.get_parent()->remove(solo_iso_table);
+		}
 	} else {
 		bottom_button_table.attach (group_button, 1, 2, 0, 1);
 		mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -670,7 +634,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	width_hide_box.show();
 	global_frame.show();
 	global_vpacker.show();
-	button_table.show();
 	mute_solo_table.show();
 	bottom_button_table.show();
 	gpm.show_all ();
@@ -722,8 +685,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 	case Wide:
 
 		if (show_sends_button)  {
-			show_sends_button->set_text (_("Aux\nSends"));
-			show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
+			show_sends_button->set_text (_("Aux"));
 		}
 
 		gpm.gain_automation_style_button.set_text (
@@ -739,8 +701,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 		}
 
 
-		Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, longest_label.c_str(), 2, _button_vpad);
-		set_size_request (-1, -1);
+		set_size_request (max (110, gpm.get_gm_width()+5), -1);
 		break;
 
 	case Narrow:
@@ -762,8 +723,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 			panners.short_astate_string(_route->panner()->automation_state()));
 		}
 
-		Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, "long", 2, _button_vpad);
-		set_size_request (max (50, gpm.get_gm_width()), -1);
+		set_size_request (max (60, gpm.get_gm_width() + 10), -1);
 		break;
 	}
 
@@ -796,6 +756,18 @@ struct RouteCompareByName {
 	}
 };
 
+gint
+MixerStrip::output_release (GdkEventButton *ev)
+{
+	switch (ev->button) {
+	case 1:
+		edit_output_configuration ();
+		break;
+	}
+	
+	return false;
+}
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
@@ -810,8 +782,7 @@ MixerStrip::output_press (GdkEventButton *ev)
 	switch (ev->button) {
 
 	case 1:
-		edit_output_configuration ();
-		break;
+		return false;  //wait for the mouse-up to pop the dialog
 
 	case 3:
 	{
@@ -873,51 +844,22 @@ MixerStrip::output_press (GdkEventButton *ev)
 	return TRUE;
 }
 
-void
-MixerStrip::edit_output_configuration ()
+gint
+MixerStrip::input_release (GdkEventButton *ev)
 {
-	if (output_selector == 0) {
-
-		boost::shared_ptr<Send> send;
-		boost::shared_ptr<IO> output;
-
-		if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
-			if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
-				output = send->output();
-			} else {
-				output = _route->output ();
-			}
-		} else {
-			output = _route->output ();
-		}
+	switch (ev->button) {
 
-		output_selector = new IOSelectorWindow (_session, output);
-	}
+	case 1:
+		edit_input_configuration ();
+		break;
+	default:
+		break;
 
-	if (output_selector->is_visible()) {
-		output_selector->get_toplevel()->get_window()->raise();
-	} else {
-		output_selector->present ();
 	}
 
-	output_selector->set_keep_above (true);
+	return false;
 }
 
-void
-MixerStrip::edit_input_configuration ()
-{
-	if (input_selector == 0) {
-		input_selector = new IOSelectorWindow (_session, _route->input());
-	}
-
-	if (input_selector->is_visible()) {
-		input_selector->get_toplevel()->get_window()->raise();
-	} else {
-		input_selector->present ();
-	}
-
-	input_selector->set_keep_above (true);
-}
 
 gint
 MixerStrip::input_press (GdkEventButton *ev)
@@ -940,8 +882,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 	switch (ev->button) {
 
 	case 1:
-		edit_input_configuration ();
-		break;
+		return false;  //don't handle the mouse-down here.  wait for mouse-up to pop the menu
 
 	case 3:
 	{
@@ -1445,8 +1386,6 @@ MixerStrip::setup_comment_button ()
 		_comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
 		);
 
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		_comment_button, _comment_button.get_text().c_str(), 2, _button_vpad);
 }
 
 bool
@@ -1523,6 +1462,13 @@ MixerStrip::build_route_ops_menu ()
 	items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
 
 	items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor)));
+
+	items.push_back (MenuElem (_("Inputs..."), sigc::mem_fun (*this, &RouteUI::edit_input_configuration)));
+
+	items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration)));
+
+	items.push_back (SeparatorElem());
+
 	if (!_route->is_master()) {
 		items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
 	}
@@ -1557,11 +1503,23 @@ MixerStrip::build_route_ops_menu ()
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-	/* show menu for either button 1 or 3, so as not to confuse people
-	   and also not hide stuff from them.
-	*/
+	if (ev->button == 3) {
+		list_route_operations ();
 
-	if (ev->button == 3 || ev->button == 1) {
+		/* do not allow rename if the track is record-enabled */
+		rename_menu_item->set_sensitive (!_route->record_enabled());
+		route_ops_menu->popup (1, ev->time);
+
+		return true;
+	}
+
+	return false;
+}
+
+gboolean
+MixerStrip::name_button_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 1) {
 		list_route_operations ();
 
 		/* do not allow rename if the track is record-enabled */
@@ -1581,6 +1539,8 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
 		/* do not allow rename if the track is record-enabled */
 		rename_menu_item->set_sensitive (!_route->record_enabled());
 		route_ops_menu->popup (1, ev->time);
+		
+		return true;
 	}
 
 	return false;
@@ -1624,39 +1584,32 @@ void
 MixerStrip::name_changed ()
 {
 	switch (_width) {
-	case Wide:
-		if (_session->config.get_track_name_number()) {
-			const int64_t track_number = _route->track_number ();
-			if (track_number == 0) {
-				number_label.set_text ("-");
-			} else {
-				number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
-			}
-		} else {
-			number_label.set_text ("");
-		}
-		name_button.set_text (_route->name());
-		break;
-	case Narrow:
-		if (_session->config.get_track_name_number()) {
-			name_button.set_markup(track_number_to_string (_route->track_number (), " ",
-						PBD::short_version (_route->name (), 5)));
-		} else {
+		case Wide:
+			name_button.set_text (_route->name());
+			break;
+		case Narrow:
 			name_button.set_text (PBD::short_version (_route->name(), 5));
-		}
-		break;
+			break;
 	}
 
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		name_button, name_button.get_text().c_str(), 2, _button_vpad);
-
 	ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+
+	if (_session->config.get_track_name_number()) {
+		const int64_t track_number = _route->track_number ();
+		if (track_number == 0) {
+			number_label.set_text ("-");
+		} else {
+			number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+		}
+	} else {
+		number_label.set_text ("");
+	}
 }
 
 void
 MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 {
-	name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+	name_button.set_layout_ellisize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -1808,48 +1761,48 @@ MixerStrip::meter_point_string (MeterPoint mp)
 	case Wide:
 		switch (mp) {
 		case MeterInput:
-			return _("in");
+			return _("In");
 			break;
 			
 		case MeterPreFader:
-			return _("pre");
+			return _("Pre");
 			break;
 			
 		case MeterPostFader:
-			return _("post");
+			return _("Post");
 			break;
 			
 		case MeterOutput:
-			return _("out");
+			return _("Out");
 			break;
 			
 		case MeterCustom:
 		default:
-			return _("custom");
+			return _("Custom");
 			break;
 		}
 		break;
 	case Narrow:
 		switch (mp) {
 		case MeterInput:
-			return _("in");
+			return _("In");
 			break;
 			
 		case MeterPreFader:
-			return _("pr");
+			return _("Pr");
 			break;
 			
 		case MeterPostFader:
-			return _("po");
+			return _("Po");
 			break;
 			
 		case MeterOutput:
-			return _("o");
+			return _("O");
 			break;
 			
 		case MeterCustom:
 		default:
-			return _("c");
+			return _("C");
 			break;
 		}
 		break;
@@ -1995,7 +1948,6 @@ MixerStrip::set_button_names ()
 {
 	switch (_width) {
 	case Wide:
-		rec_enable_button->set_text (_("Rec"));
 		mute_button->set_text (_("Mute"));
 		monitor_input_button->set_text (_("In"));
 		monitor_disk_button->set_text (_("Disk"));
@@ -2017,12 +1969,11 @@ MixerStrip::set_button_names ()
 				break;
 			}
 		}
-		solo_isolated_led->set_text (_("iso"));
-		solo_safe_led->set_text (_("lock"));
+		solo_isolated_led->set_text (_("Iso"));
+		solo_safe_led->set_text (_("Lock"));
 		break;
 
 	default:
-		rec_enable_button->set_text (_("R"));
 		mute_button->set_text (_("M"));
 		monitor_input_button->set_text (_("I"));
 		monitor_disk_button->set_text (_("D"));
@@ -2045,7 +1996,7 @@ MixerStrip::set_button_names ()
 			}
 		}
 
-		solo_isolated_led->set_text (_("i"));
+		solo_isolated_led->set_text (_("I"));
 		solo_safe_led->set_text (_("L"));
 		break;
 	}
@@ -2055,18 +2006,6 @@ MixerStrip::set_button_names ()
 	} else {
 		meter_point_button.set_text ("");
 	}
-
-	// Update size request of changed buttons
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		*rec_enable_button, rec_enable_button->get_text().c_str(), 2, _button_vpad);
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		*mute_button, mute_button->get_text().c_str(), 2, _button_vpad);
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		*monitor_input_button, monitor_input_button->get_text().c_str(), 2, _button_vpad);
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		*monitor_disk_button, monitor_disk_button->get_text().c_str(), 2, _button_vpad);
-	Gtkmm2ext::set_size_request_to_display_given_text_width (
-		*solo_button, solo_button->get_text().c_str(), 2, _button_vpad);
 }
 
 PluginSelector*
@@ -2249,6 +2188,12 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
 	add_level_meter_item_point (items, group, _("Output"), MeterOutput);
 	add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
 
+	if (gpm.meter_channels().n_audio() == 0) {
+		m->popup (ev->button, ev->time);
+		_suspend_menu_callbacks = false;
+		return;
+	}
+
 	RadioMenuItem::Group tgroup;
 	items.push_back (SeparatorElem());