remove method and inline its contents. Nothing gained by wrapping this up

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 9321f1313752e3206fbcef9728fe13b6da7df82f..a52233484053ed8d7707bc891d0a35604f921c39 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -279,7 +279,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false))
        , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
        , video_timeline(0)
-       , global_actions (X_("global"))
        , ignore_dual_punch (false)
        , main_window_visibility (0)
        , editor (0)
@@ -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;
@@ -5919,14 +5918,6 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
        return true;
 }
 
-void
-ARDOUR_UI::load_bindings ()
-{
-       if ((global_bindings = Bindings::get_bindings (X_("Global"), global_actions)) == 0) {
-               error << _("Global keybindings are missing") << endmsg;
-       }
-}
-
 void
 ARDOUR_UI::cancel_solo ()
 {
@@ -5996,7 +5987,7 @@ ARDOUR_UI::monitor_dim_all ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = global_actions.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 +6001,7 @@ ARDOUR_UI::monitor_cut_all ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = global_actions.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 +6015,7 @@ ARDOUR_UI::monitor_mono ()
        }
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
 
-       Glib::RefPtr<Action> act = global_actions.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());
 }