X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Factions.cc;h=3b0133b5355fb6e691c6d50151f401ae4ca4a018;hb=20311ed2f3024bf8408171e1bc894f4934142128;hp=44200b06facfa871afecd2359cb1befa4e2477fe;hpb=b5ab2e030b3c8de6c7f41c8d533de2462437ce7c;p=ardour.git

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 44200b06fa..3b0133b535 100644
--- 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"
 
@@ -64,23 +63,26 @@ vector<RefPtr<Gtk::Action> > ActionManager::jack_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 ()
 {
 	ui_manager = UIManager::create ();
+}
 
-	sys::path ui_file;
-
-	SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
+void
+ActionManager::load_menus ()
+{
+	std::string ui_file;
 
-	find_file_in_search_path (spath, "ardour.menus", 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;
@@ -91,7 +93,7 @@ ActionManager::init ()
 
 	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;
+		error << string_compose (_("%1 will not work without a valid ardour.menus 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";
 	}
 }