merge with master and fix 4 conflicts by hand

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index e9252bcbffc0e567614cdaff72cc5a606cb1a926..4c4117edcbb9fd46da10ee68dec341ed9bb4bb8b 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -31,7 +31,6 @@
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/rc_configuration.h"
 
@@ -59,39 +58,42 @@ 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 ();
+}
 
-       SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
+void
+ActionManager::load_menus (const string& menus_file)
+{
+       std::string ui_file;
 
-       find_file_in_search_path (spath, "ardour.menus", ui_file);
+       find_file_in_search_path (ardour_config_search_path(), menus_file, 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;
-               cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl;
+               error << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endmsg;
+               cerr << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endl;
        } catch (...) {
                error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg;
        }
 
        if (!loaded) {
-               cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl;
-               error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
+               cerr << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endl;
+               error << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endmsg;
                exit(1);
        }
 }
@@ -159,11 +161,7 @@ ActionManager::map_some_state (const char* group, const char* action, bool (RCCo
                        if (tact->get_active() != x) {
                                tact->set_active (x);
                        }
-               } else {
-                       cerr << group << ':' << action << " is not a toggle\n";
                }
-       } else {
-               cerr << group << ':' << action << " not an action\n";
        }
 }