diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
commit | 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 (patch) | |
tree | 29aa92a68feb1557c60500969d6d5aeade6a2e9b /gtk2_ardour/mixer_actor.cc | |
parent | 433b6651ee8450da8282330ac35cb7ec1abbab6f (diff) |
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_actor.cc')
-rw-r--r-- | gtk2_ardour/mixer_actor.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc index b309b9fd7f..437da39bab 100644 --- a/gtk2_ardour/mixer_actor.cc +++ b/gtk2_ardour/mixer_actor.cc @@ -83,13 +83,12 @@ MixerActor::load_bindings () bindings.set_action_map (myactions); sys::path binding_file; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); - if (find_file_in_search_path (spath, "mixer.bindings", binding_file)) { + if (find_file_in_search_path (ardour_config_search_path(), "mixer.bindings", binding_file)) { bindings.load (binding_file.to_string()); info << string_compose (_("Loaded mixer bindings from %1"), binding_file.to_string()) << endmsg; } else { - error << string_compose (_("Could not find mixer.bindings in search path %1"), spath.to_string()) << endmsg; + error << string_compose (_("Could not find mixer.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg; } } |