Use a few shared_ptrs to make things slightly neater.

[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 aac83c602a5b8ad31403996aa310ac6e6a41946c..345989277bef662f571b17585dca960fe5d15efb 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
@@ -19,33 +19,33 @@
 
 #include <glibmm/miscutils.h>
 
-#include <ardour/control_protocol_search_path.h>
-#include <ardour/directory_names.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/control_protocol_search_path.h"
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
 
 namespace {
        const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH";
 } // anonymous
 
+using namespace PBD;
+
 namespace ARDOUR {
 
 SearchPath
 control_protocol_search_path ()
 {
+       SearchPath spath (user_config_directory ());
+
+       spath += ardour_module_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));
+       SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
        
-       if (surfaces_path_defined)
-       {
-               return spath_env;
+       if (surfaces_path_defined) {
+               spath += spath_env;
        }
 
-       SearchPath spath(user_config_directory ());
-
-       spath += system_module_directory ();
-
-       spath.add_subdirectory_to_paths(surfaces_dir_name);
-
        return spath;
 }