X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpanner_search_path.cc;h=debc19c7574a289bcb5b8bb1ce5f31f575ac2676;hb=eaf58fdd50a79aa4fa2760ca5dbeb2dd4cda2e15;hp=8fff79135176f9db2e1b3bd7b5cca525fcb3d2d0;hpb=a34c5adc4089c841d7bc6a43c980b16f0ec30853;p=ardour.git diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc index 8fff791351..debc19c757 100644 --- a/libs/ardour/panner_search_path.cc +++ b/libs/ardour/panner_search_path.cc @@ -17,7 +17,6 @@ */ -#include #include #include "ardour/panner_search_path.h" @@ -35,21 +34,18 @@ namespace ARDOUR { SearchPath panner_search_path () { + SearchPath spath (user_config_directory ()); + + spath += ardour_dll_directory (); + spath.add_subdirectory_to_paths(panner_dir_name); + bool panner_path_defined = false; SearchPath spath_env (Glib::getenv(panner_env_variable_name, panner_path_defined)); if (panner_path_defined) { - std::cerr << "for panner, using environment search path " << spath_env.to_string() << std::endl; - return spath_env; + spath += spath_env; } - SearchPath spath (user_config_directory ()); - - std::cerr << "for panner, AMD = " << ardour_module_directory().to_string() << std::endl; - - spath += ardour_module_directory (); - spath.add_subdirectory_to_paths(panner_dir_name); - return spath; }