X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Factions.cc;h=da2a75fc939c720ee55dcc063d34962d70a84adf;hb=9b2612f68615d1b3f80fce732e4a13f5e50ee87d;hp=43d2eb83c9cd84fe2c2c22664b912171bffc0525;hpb=64fa63212f7e79bab16147817211a33a3f7c8fba;p=ardour.git

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 43d2eb83c9..da2a75fc93 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -36,9 +36,8 @@
 
 #include "gtkmm2ext/actions.h"
 
-#include "ardour_ui.h"
 #include "actions.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -46,24 +45,28 @@ using namespace Glib;
 using namespace PBD;
 using namespace ARDOUR;
 
-vector<RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::write_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::plugin_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::track_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::point_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::time_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::line_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::playlist_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::mouse_edit_point_requires_canvas_actions;
-
-vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::engine_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::engine_opposite_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions;
-
-static Glib::RefPtr<UIManager> ui_manager;
+typedef std::vector<RefPtr<Gtk::Action> > RelatedActions;
+
+RelatedActions ActionManager::session_sensitive_actions;
+RelatedActions ActionManager::write_sensitive_actions;
+RelatedActions ActionManager::region_list_selection_sensitive_actions;
+RelatedActions ActionManager::plugin_selection_sensitive_actions;
+RelatedActions ActionManager::track_selection_sensitive_actions;
+RelatedActions ActionManager::stripable_selection_sensitive_actions;
+RelatedActions ActionManager::route_selection_sensitive_actions;
+RelatedActions ActionManager::bus_selection_sensitive_actions;
+RelatedActions ActionManager::vca_selection_sensitive_actions;
+RelatedActions ActionManager::point_selection_sensitive_actions;
+RelatedActions ActionManager::time_selection_sensitive_actions;
+RelatedActions ActionManager::line_selection_sensitive_actions;
+RelatedActions ActionManager::playlist_selection_sensitive_actions;
+RelatedActions ActionManager::mouse_edit_point_requires_canvas_actions;
+RelatedActions ActionManager::range_sensitive_actions;
+RelatedActions ActionManager::engine_sensitive_actions;
+RelatedActions ActionManager::engine_opposite_sensitive_actions;
+RelatedActions ActionManager::transport_sensitive_actions;
+RelatedActions ActionManager::edit_point_in_region_sensitive_actions;
+RelatedActions ActionManager::rec_sensitive_actions;
 
 void
 ActionManager::init ()
@@ -139,10 +142,10 @@ ActionManager::toggle_config_state (const char* group, const char* action, bool
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 
 		if (tact) {
-			bool x = (ARDOUR_UI::config()->*get)();
+			bool x = (UIConfiguration::instance().*get)();
 
 			if (x != tact->get_active()) {
-				(ARDOUR_UI::config()->*set) (!x);
+				(UIConfiguration::instance().*set) (!x);
 			}
 		}
 	}
@@ -204,7 +207,7 @@ ActionManager::map_some_state (const char* group, const char* action, bool (UICo
 
 		if (tact) {
 
-			bool x = (ARDOUR_UI::config()->*get)();
+			bool x = (UIConfiguration::instance().*get)();
 
 			if (tact->get_active() != x) {
 				tact->set_active (x);