ARD: proper cleanup

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 5228e8552723329f651b6e4afb312ca53e50b436..1b4bd0476d614e132a174b661c71f7149ef0c2a2 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -30,6 +30,11 @@
 
 #include "i18n.h"
 
+#ifdef PLATFORM_WINDOWS
+#include "shlobj.h"
+#include "pbd/windows_special_dirs.h"
+#endif
+
 using namespace PBD;
 
 namespace ARDOUR {
@@ -54,8 +59,12 @@ user_config_directory ()
        if ((c = getenv ("XDG_CONFIG_HOME")) != 0) {
                p = c;
        } else {
+#ifdef PLATFORM_WINDOWS
+               // Not technically the home dir (since it needs to be a writable folder)
+               const string home_dir = Glib::build_filename (Glib::get_user_config_dir(), user_config_dir_name);
+#else
                const string home_dir = Glib::get_home_dir();
-
+#endif
                if (home_dir.empty ()) {
                        error << "Unable to determine home directory" << endmsg;
                        exit (1);
@@ -66,7 +75,9 @@ user_config_directory ()
        }
 #endif
 
+#ifndef PLATFORM_WINDOWS
        p = Glib::build_filename (p, user_config_dir_name);
+#endif
 
        if (!Glib::file_test (p, Glib::FILE_TEST_EXISTS)) {
                if (g_mkdir_with_parents (p.c_str(), 0755)) {
@@ -95,14 +106,18 @@ user_cache_directory ()
 #else
        const char* c = 0;
 
-       /* adopt freedesktop standards, and put .ardour3 into $XDG_CONFIG_HOME or ~/.config
+       /* adopt freedesktop standards, and put .ardour3 into $XDG_CACHE_HOME
+        * defaulting to or ~/.config
         */
-
        if ((c = getenv ("XDG_CACHE_HOME")) != 0) {
                p = c;
        } else {
+#ifdef PLATFORM_WINDOWS
+               // Not technically the home dir (since it needs to be a writable folder)
+               const string home_dir = Glib::build_filename (Glib::get_user_data_dir(), user_config_dir_name);
+#else
                const string home_dir = Glib::get_home_dir();
-
+#endif
                if (home_dir.empty ()) {
                        error << "Unable to determine home directory" << endmsg;
                        exit (1);
@@ -113,7 +128,9 @@ user_cache_directory ()
        }
 #endif
 
+#ifndef PLATFORM_WINDOWS
        p = Glib::build_filename (p, user_config_dir_name);
+#endif
 
        if (!Glib::file_test (p, Glib::FILE_TEST_EXISTS)) {
                if (g_mkdir_with_parents (p.c_str(), 0755)) {
@@ -166,15 +183,13 @@ ardour_config_search_path ()
                search_path += user_config_directory();
 #ifdef PLATFORM_WINDOWS
                search_path += windows_search_path ();
-#else
+#endif
                std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
                if (s.empty()) {
-                       std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
-                       ::exit (1);
+                       std::cerr << _("ARDOUR_CONFIG_PATH not set in environment\n");
+               } else {
+                       search_path += Searchpath (s);
                }
-               
-               search_path += Searchpath (s);
-#endif
        }
 
        return search_path;
@@ -189,15 +204,13 @@ ardour_data_search_path ()
                search_path += user_config_directory();
 #ifdef PLATFORM_WINDOWS
                search_path += windows_search_path ();
-#else
+#endif
                std::string s = Glib::getenv("ARDOUR_DATA_PATH");
                if (s.empty()) {
-                       std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
-                       ::exit (1);
+                       std::cerr << _("ARDOUR_DATA_PATH not set in environment\n");
+               } else {
+                       search_path += Searchpath (s);
                }
-               
-               search_path += Searchpath (s);
-#endif
        }
 
        return search_path;