From 59cdb46c2fed1faf3ae7828198d4da5c5874e59f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 10 Apr 2014 04:10:50 -0400 Subject: [PATCH] provide a non-hard-coded menu file name to ActionManager when loading menus --- gtk2_ardour/actions.cc | 4 ++-- gtk2_ardour/actions.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index cefaeeb4cf..bdb6821f89 100644 --- 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 f3fba51de5..50f9c20b82 100644 --- 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 > session_sensitive_actions; extern std::vector > write_sensitive_actions;