From 7f280e2bed51cfa56fedeaf08f28b6040c93b5b1 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 9 Jan 2017 08:17:38 -0600 Subject: Remove the Solo+Iso buttons in the Master bus. --- gtk2_ardour/mixer_strip.cc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/mixer_strip.cc') diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 0a31ac72bb..de8721f1af 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -210,10 +210,6 @@ MixerStrip::init () solo_iso_table.set_homogeneous (true); solo_iso_table.set_spacings (2); - if (!ARDOUR::Profile->get_trx()) { - solo_iso_table.attach (*solo_isolated_led, 0, 1, 0, 1); - solo_iso_table.attach (*solo_safe_led, 1, 2, 0, 1); - } solo_iso_table.show (); rec_mon_table.set_homogeneous (true); @@ -545,13 +541,18 @@ MixerStrip::set_route (boost::shared_ptr rt) mute_solo_table.remove (*mute_button); } + if (solo_safe_led->get_parent()) { + solo_iso_table.remove (*solo_safe_led); + } + + if (solo_isolated_led->get_parent()) { + solo_iso_table.remove (*solo_isolated_led); + } + if (route()->is_master()) { 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); - } if (monitor_section_button == 0) { Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); @@ -572,6 +573,10 @@ MixerStrip::set_route (boost::shared_ptr rt) mute_button->show (); solo_button->show (); rec_mon_table.show (); + if (!ARDOUR::Profile->get_trx()) { + solo_iso_table.attach (*solo_isolated_led, 0, 1, 0, 1); + solo_iso_table.attach (*solo_safe_led, 1, 2, 0, 1); + } } if (_mixer_owned && route()->is_master() ) { -- cgit v1.2.3