add wine/windows-vst start script

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 5391d58f42c22663c4586f98e03780fc7f64ac9e..cefaeeb4cf9a00b4ec625b349c9615f179aff553 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -58,26 +58,31 @@ 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::jack_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_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;
 
 void
 ActionManager::init ()
 {
-       sys::path ui_file;
-
        ui_manager = UIManager::create ();
+}
+
+void
+ActionManager::load_menus ()
+{
+       std::string ui_file;
 
        find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file);
 
        bool loaded = false;
 
        try {
-               ui_manager->add_ui_from_file (ui_file.to_string());
-               info << string_compose (_("Loading menus from %1"), ui_file.to_string()) << endmsg;
+               ui_manager->add_ui_from_file (ui_file);
+               info << string_compose (_("Loading menus from %1"), ui_file) << endmsg;
                loaded = true;
        } catch (Glib::MarkupError& err) {
                error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;