diff options
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r-- | libs/ardour/globals.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 96d93ea5bc..c6aa660115 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -319,14 +319,9 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization) /* Make VAMP look in our library ahead of anything else */ - char *p = getenv ("VAMP_PATH"); - string vamppath = VAMP_DIR; - if (p) { - vamppath += ':'; - vamppath += p; - } - setenv ("VAMP_PATH", vamppath.c_str(), 1); - + SearchPath sp (ardour_dll_directory()); + sp.add_subdirectory_to_paths ("vamp"); + setenv ("VAMP_PATH", sp.to_string().c_str(), 1); setup_hardware_optimization (try_optimization); @@ -400,7 +395,7 @@ void ARDOUR::find_bindings_files (map<string,string>& files) { vector<sys::path> found; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); + SearchPath spath = ardour_config_search_path(); if (getenv ("ARDOUR_SAE")) { Glib::PatternSpec pattern("*SAE-*.bindings"); |