From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 7 Dec 2018 21:07:13 +0000 (-0500)
Subject: use new action map API instead of ActionManager::get_action
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=24331aaf202b43aa33cc9d6464d6e3f7fab900f5

use new action map API instead of ActionManager::get_action
---

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 625605447c..2705a544fd 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -129,7 +129,7 @@ ARDOUR_UI::toggle_click ()
 void
 ARDOUR_UI::toggle_session_monitoring_in ()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("SessionMonitorIn"));
+	Glib::RefPtr<Action> act = find_action (X_("Transport"), X_("SessionMonitorIn"));
 	if (!act) {
 		return;
 	}
@@ -155,7 +155,7 @@ ARDOUR_UI::toggle_session_monitoring_in ()
 void
 ARDOUR_UI::toggle_session_monitoring_disk ()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("SessionMonitorDisk"));
+	Glib::RefPtr<Action> act = find_action (X_("Transport"), X_("SessionMonitorDisk"));
 	if (!act) {
 		return;
 	}
@@ -180,7 +180,7 @@ ARDOUR_UI::toggle_session_monitoring_disk ()
 void
 ARDOUR_UI::unset_dual_punch ()
 {
-	Glib::RefPtr<Action> action = global_actions.find_action ("Transport", "TogglePunch");
+	Glib::RefPtr<Action> action = find_action ("Transport", "TogglePunch");
 
 	if (action) {
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
@@ -199,7 +199,7 @@ ARDOUR_UI::toggle_punch ()
 		return;
 	}
 
-	Glib::RefPtr<Action> action = global_actions.find_action ("Transport", "TogglePunch");
+	Glib::RefPtr<Action> action = find_action ("Transport", "TogglePunch");
 
 	if (action) {
 
@@ -211,8 +211,8 @@ ARDOUR_UI::toggle_punch ()
 
 		/* drive the other two actions from this one */
 
-		Glib::RefPtr<Action> in_action = global_actions.find_action ("Transport", "TogglePunchIn");
-		Glib::RefPtr<Action> out_action = global_actions.find_action ("Transport", "TogglePunchOut");
+		Glib::RefPtr<Action> in_action = find_action ("Transport", "TogglePunchIn");
+		Glib::RefPtr<Action> out_action = find_action ("Transport", "TogglePunchOut");
 
 		if (in_action && out_action) {
 			Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(in_action);
@@ -226,7 +226,7 @@ ARDOUR_UI::toggle_punch ()
 void
 ARDOUR_UI::toggle_punch_in ()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("TogglePunchIn"));
+	Glib::RefPtr<Action> act = find_action (X_("Transport"), X_("TogglePunchIn"));
 	if (!act) {
 		return;
 	}
@@ -252,7 +252,7 @@ ARDOUR_UI::toggle_punch_in ()
 void
 ARDOUR_UI::toggle_punch_out ()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("TogglePunchOut"));
+	Glib::RefPtr<Action> act = find_action (X_("Transport"), X_("TogglePunchOut"));
 	if (!act) {
 		return;
 	}
@@ -311,7 +311,7 @@ ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 void
 ARDOUR_UI::toggle_video_sync()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action ("Transport", "ToggleVideoSync");
+	Glib::RefPtr<Action> act = find_action ("Transport", "ToggleVideoSync");
 	if (act) {
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 		_session->config.set_use_video_sync (tact->get_active());
@@ -321,7 +321,7 @@ ARDOUR_UI::toggle_video_sync()
 void
 ARDOUR_UI::toggle_editing_space()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action ("Common", "ToggleMaximalEditor");
+	Glib::RefPtr<Action> act = find_action ("Common", "ToggleMaximalEditor");
 
 	if (act) {
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -352,14 +352,14 @@ ARDOUR_UI::parameter_changed (std::string p)
 
 		if (!_session->config.get_external_sync()) {
 			sync_button.set_text (S_("SyncSource|Int."));
-			global_actions.find_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
-			global_actions.find_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
-			global_actions.find_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
+			find_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
+			find_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
+			find_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
 		} else {
 			/* XXX we need to make sure that auto-play is off as well as insensitive */
-			global_actions.find_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
-			global_actions.find_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
-			global_actions.find_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
+			find_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
+			find_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+			find_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
 		}
 
 	} else if (p == "sync-source") {
@@ -398,8 +398,8 @@ ARDOUR_UI::parameter_changed (std::string p)
 	} else if (p == "auto-input") {
 		ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input));
 	} else if (p == "session-monitoring") {
-		Glib::RefPtr<Action> iact = global_actions.find_action (X_("Transport"), X_("SessionMonitorIn"));
-		Glib::RefPtr<Action> dact = global_actions.find_action (X_("Transport"), X_("SessionMonitorDisk"));
+		Glib::RefPtr<Action> iact = find_action (X_("Transport"), X_("SessionMonitorIn"));
+		Glib::RefPtr<Action> dact = find_action (X_("Transport"), X_("SessionMonitorDisk"));
 		if (iact && dact) {
 			Glib::RefPtr<ToggleAction> tdact = Glib::RefPtr<ToggleAction>::cast_dynamic(dact);
 			Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(iact);
@@ -577,7 +577,7 @@ ARDOUR_UI::reset_main_clocks ()
 void
 ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
 {
-	Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("ToggleExternalSync"));
+	Glib::RefPtr<Action> act = find_action (X_("Transport"), X_("ToggleExternalSync"));
 
 	if (!act) {
 		return;