X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=287c9128b47e3467585839eaffc45eae67ba8f2d;hb=154f9825ff72d691ba550de573948424b81a09a6;hp=7a8366517e6165ec7f2829b47eb7fdedb9c31849;hpb=4dc65e6613a375a836de4dd9901ac50a4ab43be6;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 7a8366517e..287c9128b4 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -144,13 +144,6 @@ ARDOUR_UI::set_session (Session *s)
 		ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
 	}
 
-	if (!_session->monitor_out()) {
-		Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
-		if (act) {
-			act->set_sensitive (false);
-		}
-	}
-
 	/* allow wastebasket flush again */
 
 	Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
@@ -717,14 +710,14 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t)
 	}
 
 	for (std::vector<std::string>::iterator s = insensitive_action_names.begin(); s != insensitive_action_names.end(); ++s) {
-		action = ActionManager::get_action (X_("Common"), (*s).c_str());
+		action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
 		if (action) {
 			action->set_sensitive (false);
 		}
 	}
 
 	for (std::vector<std::string>::iterator s = sensitive_action_names.begin(); s != sensitive_action_names.end(); ++s) {
-		action = ActionManager::get_action (X_("Common"), (*s).c_str());
+		action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
 		if (action) {
 			action->set_sensitive (true);
 		}
@@ -959,49 +952,3 @@ ARDOUR_UI::toggle_mixer_space()
 		}
 	}
 }
-
-void
-ARDOUR_UI::toggle_mixer_list()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMixerList");
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-			mixer->show_mixer_list (tact->get_active());
-	}
-}
-
-void
-ARDOUR_UI::toggle_monitor_section_visibility ()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-			mixer->show_monitor_section (tact->get_active());
-	}
-}
-
-void
-ARDOUR_UI::toggle_vca_pane ()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleVCAPane");
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-		mixer->showhide_vcas (tact->get_active());
-	}
-}
-
-#ifdef MIXBUS
-void
-ARDOUR_UI::toggle_mixbus_pane ()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMixbusPane");
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-		mixer->showhide_mixbusses (tact->get_active());
-	}
-}
-#endif