ardour/livetrax
13
0
Fork 0
Code

Revert "Remove the Solo+Iso buttons in the Master bus."

Browse Source 
This reverts commit 7f280e2bed.
This commit is contained in:
Ben Loftis 2017-01-09 19:07:17 -06:00
parent d3f2451ad0
commit 69d043766f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/mixer_strip.cc
View File

@ -210,6 +210,10 @@ MixerStrip::init ()
solo_iso_table.set_homogeneous (true); solo_iso_table.set_homogeneous (true);
solo_iso_table.set_spacings (2); 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 (); solo_iso_table.show ();
rec_mon_table.set_homogeneous (true); rec_mon_table.set_homogeneous (true);
@ -541,18 +545,13 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
mute_solo_table.remove (*mute_button); 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()) { if (route()->is_master()) {
solo_button->hide (); solo_button->hide ();
mute_button->show (); mute_button->show ();
rec_mon_table.hide (); rec_mon_table.hide ();
if (solo_iso_table.get_parent()) {
solo_iso_table.get_parent()->remove(solo_iso_table);
}
if (monitor_section_button == 0) { if (monitor_section_button == 0) {
Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection"); Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
_session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); _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 (); mute_button->show ();
solo_button->show (); solo_button->show ();
rec_mon_table.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() ) { if (_mixer_owned && route()->is_master() ) {