From f5c18302634a77cc5f1149d1383cda94f214196d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 4 Oct 2020 16:28:28 +0200 Subject: [PATCH] Show monitor-section button only in the mixer window Previously it was possible to to also have it visible on the editor-mixer. Also always use "Mon", the text also fits on narrow mixer-strips --- gtk2_ardour/mixer_strip.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index b00c0407d0..cf84809919 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -625,7 +625,7 @@ MixerStrip::set_route (boost::shared_ptr rt) _volume_controller->show (); } - if (monitor_section_button == 0) { + if (monitor_section_button == 0 && _mixer_owned) { Glib::RefPtr act = ActionManager::get_action ("Mixer", "ToggleMonitorSection"); _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); _session->MonitorBusAddedOrRemoved.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_section_added_or_removed, this), gui_context()); @@ -634,8 +634,6 @@ MixerStrip::set_route (boost::shared_ptr rt) monitor_changed (); monitor_section_button->set_related_action (act); set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section")); - mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1); - monitor_section_button->show(); monitor_section_button->unset_flags (Gtk::CAN_FOCUS); monitor_section_added_or_removed (); } @@ -2358,7 +2356,7 @@ MixerStrip::set_button_names () monitor_input_button->set_text (S_("MonitorInput|I")); monitor_disk_button->set_text (S_("MonitorDisk|D")); if (monitor_section_button) { - monitor_section_button->set_text (S_("Mon|O")); + monitor_section_button->set_text (_("Mon")); } if ((_route && _route->solo_safe_control()->solo_safe()) || !solo_button->get_sensitive()) {