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

This commit is contained in:
Paul Davis 2014-04-10 04:10:50 -04:00
parent 01af11c25c
commit 59cdb46c2f
2 changed files with 3 additions and 3 deletions

View file

@ -72,11 +72,11 @@ ActionManager::init ()
} }
void void
ActionManager::load_menus () ActionManager::load_menus (const string& menus_file)
{ {
std::string ui_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; bool loaded = false;

View file

@ -30,7 +30,7 @@ namespace ActionManager {
/* Ardour specific */ /* Ardour specific */
extern void init (); 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> > session_sensitive_actions;
extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions;