diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2017-01-09 19:07:17 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2017-01-09 19:07:36 -0600 |
| commit | 69d043766f3e0f4715f6c9b32afa93069de7df61 (patch) | |
| tree | 17689ce94bbbb4d01147f78a88977909ecbc9f08 /gtk2_ardour/mixer_strip.cc | |
| parent | d3f2451ad0f49f576d5c0b7163440b7dcff663de (diff) | |
Revert "Remove the Solo+Iso buttons in the Master bus."
This reverts commit 7f280e2bed51cfa56fedeaf08f28b6040c93b5b1.
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index de8721f1af..0a31ac72bb 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -210,6 +210,10 @@ 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); @@ -541,18 +545,13 @@ MixerStrip::set_route (boost::shared_ptr<Route> 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<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection"); _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); @@ -573,10 +572,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> 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() ) { |