Handle overlaps better when executing DiffCommands.

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 55a8a9983f6c4a16b16b9ceaa0f7399c64843084..932416ef413afd4e8b403c8833079dc5161baf05 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.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
@@ -16,13 +16,19 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include <cstdlib>
 
-#include <pbd/error.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 {
 
@@ -31,22 +37,76 @@ using std::string;
 sys::path
 user_config_directory ()
 {
-       const string home_dir = Glib::get_home_dir ();
+       const char* c = 0;
+       sys::path p;
+
+       /* adopt freedesktop standards, and put .ardour3 into $XDG_CONFIG_HOME or ~/.config
+        */
+
+       if ((c = getenv ("XDG_CONFIG_HOME")) != 0) {
+               p = c;
+       } else {
+               const string home_dir = Glib::get_home_dir();
+       
+               if (home_dir.empty ()) {
+                       const string error_msg = "Unable to determine home directory";
+                       
+                       // log the error
+                       error << error_msg << endmsg;
+                       
+                       throw sys::filesystem_error(error_msg);
+               }
+
+               p = home_dir;
+               p /= ".config";
+       }
+       
+       p /= user_config_dir_name;
 
-       if (home_dir.empty ())
-       {
-               const string error_msg = "Unable to determine home directory";
+       return p;
+}
 
-               // log the error
-               error << error_msg << endmsg;
+sys::path
+ardour_module_directory ()
+{
+       sys::path module_directory(MODULE_DIR);
+       module_directory /= "ardour3";
+       return module_directory;
+}
 
-               throw sys::filesystem_error(error_msg);
-       }
+SearchPath
+ardour_search_path ()
+{
+       SearchPath spath_env(Glib::getenv("ARDOUR_PATH"));
+       return spath_env;
+}
 
-       sys::path p(home_dir);
-       p /= user_config_dir_name;
+SearchPath
+system_config_search_path ()
+{
+#ifdef WITH_STATIC_PATHS
+       SearchPath config_path(string(CONFIG_DIR));
+#else
+       SearchPath config_path(system_config_directories());
+#endif
 
-       return p;
+       config_path.add_subdirectory_to_paths("ardour3");
+
+       return config_path;
+}
+
+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("ardour3");
+
+       return data_path;
 }
 
 } // namespace ARDOUR