Sort session routes before trying to do the group tabs

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index e41b9954cfb01d2696ce80bb8313331147d558e0..5dc5e4dbdef823bb31cf4fc796e5a6a4d37801ec 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,20 +16,19 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include <cstdlib>
 
-#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
 
-namespace {
-       const char * const config_env_variable_name = "ARDOUR_CONFIG_PATH";
-}
+using namespace PBD;
 
 namespace ARDOUR {
 
@@ -38,19 +37,30 @@ 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";
+               if (home_dir.empty ()) {
+                       const string error_msg = "Unable to determine home directory";
 
-               // log the error
-               error << error_msg << endmsg;
+                       // log the error
+                       error << error_msg << endmsg;
 
-               throw sys::filesystem_error(error_msg);
+                       throw sys::filesystem_error(error_msg);
+               }
+
+               p = home_dir;
+               p /= ".config";
        }
 
-       sys::path p(home_dir);
        p /= user_config_dir_name;
 
        return p;
@@ -60,34 +70,43 @@ sys::path
 ardour_module_directory ()
 {
        sys::path module_directory(MODULE_DIR);
-       module_directory /= "ardour2";
+       module_directory /= "ardour3";
        return module_directory;
 }
 
 SearchPath
-config_search_path ()
+ardour_search_path ()
 {
-       bool config_path_defined = false;
-       SearchPath spath_env(Glib::getenv(config_env_variable_name, config_path_defined));
-
-       if (config_path_defined)
-       {
-               return spath_env;
-       }
+       SearchPath spath_env(Glib::getenv("ARDOUR_PATH"));
+       return spath_env;
+}
 
+SearchPath
+system_config_search_path ()
+{
 #ifdef WITH_STATIC_PATHS
-
-       SearchPath spath(string(CONFIG_DIR));
-
+       SearchPath config_path(string(CONFIG_DIR));
 #else
+       SearchPath config_path(system_config_directories());
+#endif
 
-       SearchPath spath(system_config_directories());
+       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
 
-       spath.add_subdirectory_to_paths("ardour2");
+       data_path.add_subdirectory_to_paths("ardour3");
 
-       return spath;
+       return data_path;
 }
 
 } // namespace ARDOUR