use ActionManager namespace, rather than ActionMap objects, and remove all per-contex...

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 6fd4ac41459edebdee778510d84d3c48f2fb82cb..c6fdd4f87a5939ed882af70cf12343885b1ab793 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -273,7 +273,6 @@ libxml_structured_error_func (void* /* parsing_context*/,
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        : Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp)
-       , Gtkmm2ext::ActionMapOwner (X_("global"))
        , session_load_in_progress (false)
        , gui_object_state (new GUIObjectState)
        , primary_clock   (new MainClock (X_("primary"),   X_("transport"), true ))
@@ -757,7 +756,7 @@ ARDOUR_UI::post_engine ()
                output << "      <tr><th>Action Name</th><th>Menu Name</th></tr>" << endl;
                output << "  </thead>\n  <tbody>" << endl;
 
-               Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+               ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
                vector<string>::iterator p;
                vector<string>::iterator l;
@@ -5922,7 +5921,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
 void
 ARDOUR_UI::load_bindings ()
 {
-       if ((global_bindings = Bindings::get_bindings (X_("Global"), myactions)) == 0) {
+       if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
                error << _("Global keybindings are missing") << endmsg;
        }
 }
@@ -5996,7 +5995,7 @@ ARDOUR_UI::monitor_dim_all ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = find_action (X_("Monitor"), "monitor-dim-all");
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all");
        assert (act);  Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
        assert (tact); _monitor->set_dim_all (tact->get_active());
 }
@@ -6010,7 +6009,7 @@ ARDOUR_UI::monitor_cut_all ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = find_action (X_("Monitor"), "monitor-cut-all");
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all");
        assert (act);  Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
        assert (tact); _monitor->set_cut_all (tact->get_active());
 }
@@ -6024,7 +6023,7 @@ ARDOUR_UI::monitor_mono ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = find_action (X_("Monitor"), "monitor-mono");
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-mono");
        assert (act);  Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
        assert (tact);_monitor->set_mono (tact->get_active());
 }