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 a74195b4c0718b9b09c028281e3b546bc14184f9..c5c5d0ba00a3000f34f87a00d342192a411b7d14 100644 (file)
--- a/libs/ardour/control_protocol_search_path.cc
+++ b/libs/ardour/control_protocol_search_path.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Tim Mayberry 
+    Copyright (C) 2007 Tim Mayberry
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 */
 
+#include <iostream>
+
 #include <glibmm/miscutils.h>
 
 #include "ardour/control_protocol_search_path.h"
@@ -31,23 +33,14 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-SearchPath
+Searchpath
 control_protocol_search_path ()
 {
-       bool surfaces_path_defined = false;
-       SearchPath spath_env(Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
+       Searchpath spath(user_config_directory ());
+       spath += ardour_dll_directory ();
+       spath.add_subdirectory_to_paths (surfaces_dir_name);
        
-       if (surfaces_path_defined)
-       {
-               return spath_env;
-       }
-
-       SearchPath spath(user_config_directory ());
-
-       spath += ardour_module_directory ();
-
-       spath.add_subdirectory_to_paths(surfaces_dir_name);
-
+       spath += Searchpath(Glib::getenv(surfaces_env_variable_name));
        return spath;
 }