X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fcontrol_protocol_search_path.cc;h=254cd03fe94c23fb9a91c4460d6b76d97ea4c706;hb=5e1cfcc7ed557fc28ca8b362deceefa1967ab22b;hp=a74195b4c0718b9b09c028281e3b546bc14184f9;hpb=3b89d9eaa03406a5e03648f47734211f09b89d62;p=ardour.git

diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc
index a74195b4c0..254cd03fe9 100644
--- 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"
@@ -34,20 +36,11 @@ namespace ARDOUR {
 SearchPath
 control_protocol_search_path ()
 {
-	bool surfaces_path_defined = false;
-	SearchPath spath_env(Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
-	
-	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 += ardour_dll_directory ();
+	spath.add_subdirectory_to_paths (surfaces_dir_name);
+	
+	spath += SearchPath(Glib::getenv(surfaces_env_variable_name));
 	return spath;
 }