use new action map API instead of ActionManager::get_action
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Dec 2018 21:07:13 +0000 (16:07 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 10 Dec 2018 13:34:01 +0000 (08:34 -0500)
gtk2_ardour/window_manager.cc

index cdb83fba8b76893918b0ddcb39bb823a407f791c..d66efa24942178386f0120f8ae9620fa8b7b7b20 100644 (file)
@@ -66,10 +66,10 @@ Manager::register_window (ProxyBase* info)
        if (!info->menu_name().empty()) {
 
                if (!window_actions) {
-                       window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window"));
+                       window_actions = ARDOUR_UI::instance()->action_map().create_action_group (X_("Window"));
                }
 
-               ARDOUR_UI::instance()->global_actions.register_toggle_action (window_actions,
+               ARDOUR_UI::instance()->action_map().register_toggle_action (window_actions,
                                                                              info->action_name().c_str(), info->menu_name().c_str(),
                                                                              sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info));
 
@@ -82,7 +82,7 @@ Manager::register_window (ProxyBase* info)
 void
 Manager::window_proxy_was_mapped (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }
@@ -97,7 +97,7 @@ Manager::window_proxy_was_mapped (ProxyBase* proxy)
 void
 Manager::window_proxy_was_unmapped (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }
@@ -123,7 +123,7 @@ Manager::remove (const ProxyBase* info)
 void
 Manager::toggle_window (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }