Improve import status messages slightly.

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index dd41198142e7d34f2516f2068cd93330de0652f4..7372c467a65bf2ca3d4dbf43ae4c0883a229d924 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -17,16 +17,18 @@
 
 */
 
-#include <pbd/error.h>
-#include <pbd/filesystem_paths.h>
+#include "pbd/error.h"
+#include "pbd/filesystem_paths.h"
 
 #include <glibmm/miscutils.h>
 
-#include <ardour/directory_names.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
 
 #define WITH_STATIC_PATHS 1
 
+using namespace PBD;
+
 namespace ARDOUR {
 
 using std::string;
@@ -36,8 +38,7 @@ user_config_directory ()
 {
        const string home_dir = Glib::get_home_dir ();
 
-       if (home_dir.empty ())
-       {
+       if (home_dir.empty ()) {
                const string error_msg = "Unable to determine home directory";
 
                // log the error
@@ -56,7 +57,7 @@ sys::path
 ardour_module_directory ()
 {
        sys::path module_directory(MODULE_DIR);
-       module_directory /= "ardour2";
+       module_directory /= "ardour3";
        return module_directory;
 }
 
@@ -71,16 +72,12 @@ SearchPath
 system_config_search_path ()
 {
 #ifdef WITH_STATIC_PATHS
-
        SearchPath config_path(string(CONFIG_DIR));
-
 #else
-
        SearchPath config_path(system_config_directories());
-
 #endif
 
-       config_path.add_subdirectory_to_paths("ardour2");
+       config_path.add_subdirectory_to_paths("ardour3");
 
        return config_path;
 }
@@ -89,16 +86,12 @@ SearchPath
 system_data_search_path ()
 {
 #ifdef WITH_STATIC_PATHS
-
        SearchPath data_path(string(DATA_DIR));
-
 #else
-
        SearchPath data_path(system_data_directories());
-
 #endif
 
-       data_path.add_subdirectory_to_paths("ardour2");
+       data_path.add_subdirectory_to_paths("ardour3");
 
        return data_path;
 }