provide a non-hard-coded menu file name to ActionManager when loading menus

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index cefaeeb4cf9a00b4ec625b349c9615f179aff553..bdb6821f89933a290e27562c44270c258173702a 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -72,11 +72,11 @@ ActionManager::init ()
 }
 
 void
-ActionManager::load_menus ()
+ActionManager::load_menus (const string& menus_file)
 {
        std::string ui_file;
 
-       find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file);
+       find_file_in_search_path (ardour_config_search_path(), menus_file, ui_file);
 
        bool loaded = false;
 

diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index f3fba51de54d7790e8a593cce9279465302cd869..50f9c20b8213118b27c8bbc38823fead9edb9ca1 100644 (file)
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -30,7 +30,7 @@ namespace ActionManager {
        /* Ardour specific */
 
        extern void init ();
-       extern void load_menus ();
+       extern void load_menus (const std::string& menus_file_name); /* not path, just name */
 
        extern std::vector<Glib::RefPtr<Gtk::Action> > session_sensitive_actions;
        extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions;