From a4752e057d6a265aee919acdf348adccab9126a7 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 10 Mar 2014 16:05:40 +0000 Subject: Modify 'user_config_directory()' and 'user_cache_directory()' so that (on Windows) they'll always return a directory that's guaranteed to be writable (in Windows, this isn't always true for the user's home folder) --- libs/ardour/filesystem_paths.cc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'libs/ardour') diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index a523e35730..acb691d7db 100644 --- 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,14 @@ user_config_directory () if ((c = getenv ("XDG_CONFIG_HOME")) != 0) { p = c; } else { - const string home_dir = Glib::get_home_dir(); +#ifdef PLATFORM_WINDOWS + std::string home_dir; + if (0 != PBD::get_win_special_folder(CSIDL_LOCAL_APPDATA)) + home_dir = PBD::get_win_special_folder(CSIDL_LOCAL_APPDATA); +#else + const string home_dir = Glib::get_home_dir(); +#endif if (home_dir.empty ()) { error << "Unable to determine home directory" << endmsg; exit (1); @@ -104,7 +115,14 @@ user_cache_directory () if ((c = getenv ("XDG_CACHE_HOME")) != 0) { p = c; } else { +#ifdef PLATFORM_WINDOWS + std::string home_dir; + + if (0 != PBD::get_win_special_folder(CSIDL_LOCAL_APPDATA)) + home_dir = PBD::get_win_special_folder(CSIDL_LOCAL_APPDATA); +#else const string home_dir = Glib::get_home_dir(); +#endif if (home_dir.empty ()) { error << "Unable to determine home directory" << endmsg; -- cgit v1.2.3