plugin scan progress-display & preferences

[ardour.git] / libs / ardour / control_protocol_search_path.cc

diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc
index 157531cbf251eba7e398e9f76a4f450e570ba5f7..c5c5d0ba00a3000f34f87a00d342192a411b7d14 100644 (file)
--- a/libs/ardour/control_protocol_search_path.cc
+++ b/libs/ardour/control_protocol_search_path.cc
@@ -33,21 +33,14 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-SearchPath
+Searchpath
 control_protocol_search_path ()
 {
-       SearchPath spath (user_config_directory ());
-
+       Searchpath spath(user_config_directory ());
        spath += ardour_dll_directory ();
        spath.add_subdirectory_to_paths (surfaces_dir_name);
-
-       bool surfaces_path_defined = false;
-       SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
        
-       if (surfaces_path_defined) {
-               spath += spath_env;
-       }
-
+       spath += Searchpath(Glib::getenv(surfaces_env_variable_name));
        return spath;
 }