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);
+ // 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
}
#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)) {
/* adopt freedesktop standards, and put .ardour3 into $XDG_CACHE_HOME
* defaulting to or ~/.config
- *
- * NB this should work on windows, too, but we may want to prefer
- * PBD::get_platform_fallback_folder (PBD::FOLDER_VST) or someplace
*/
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);
+ // 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);
}
#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)) {
static Searchpath search_path;
if (search_path.empty()) {
+ // Start by adding the user's personal config folder
search_path += user_config_directory();
#ifdef PLATFORM_WINDOWS
- search_path += windows_search_path ();
+ // On Windows, add am intermediate configuration folder
+ // (one that's guaranteed to be writable by all users).
+ const gchar* const *all_users_folder = g_get_system_config_dirs();
+ // Despite its slightly odd name, the above returns a single entry which
+ // corresponds to 'All Users' on Windows (according to the documentation)
+
+ if (all_users_folder) {
+ std::string writable_all_users_path = all_users_folder[0];
+ writable_all_users_path += "\\";
+ writable_all_users_path += PROGRAM_NAME;
+ writable_all_users_path += "\\.config";
+#ifdef _WIN64
+ writable_all_users_path += "\\win64";
#else
+ writable_all_users_path += "\\win32";
+#endif
+ search_path += writable_all_users_path;
+ }
+
+ // now add a suitable config path from the bundle
+ search_path += windows_search_path ();
+#endif
+ // finally, add any paths from ARDOUR_CONFIG_PATH if it exists
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;
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;