allow sending OSC from inline display UIs

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 7f11d053e8fbd42c1b43813116874a2fbf1698c2..28367ff3f3605637856c813094d23d30429d0c20 100644 (file)
--- 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,23 +45,24 @@ 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::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::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 ()
@@ -138,10 +138,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);
                        }
                }
        }
@@ -203,7 +203,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);