#include <iostream>
#include "pbd/compose.h"
-#include "pbd/convert.h"
#include "pbd/error.h"
+#include "pbd/string_convert.h"
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include "ardour/directory_names.h"
#include "ardour/filesystem_paths.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#ifdef PLATFORM_WINDOWS
#include "shlobj.h"
user_config_directory_name (int version = -1)
{
if (version < 0) {
- version = atoi (X_(PROGRAM_VERSION));
+ version = string_to<int32_t>(X_(PROGRAM_VERSION));
}
/* ARDOUR::Profile may not be available when this is
called, so rely on build-time detection of the
product name etc.
*/
-
+
#ifdef USE_TRACKS_CODE_FEATURES
/* Tracks does not use versioned configuration folders, which may or
may not be problematic in the future.
*/
return X_(PROGRAM_NAME);
-#else
+#else
const string config_dir_name = string_compose ("%1%2", X_(PROGRAM_NAME), version);
#if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
/* use lower case folder name on Linux */
return downcase (config_dir_name);
#endif
-#endif
-}
+#endif
+}
std::string
user_config_directory (int version)
}
std::string
-user_cache_directory ()
+user_cache_directory (std::string cachename)
{
- static std::string p;
-
- if (!p.empty()) return p;
+ std::string p;
#ifdef __APPLE__
p = Glib::build_filename (Glib::get_home_dir(), "Library/Caches");
}
#endif // end not __APPLE__
- p = Glib::build_filename (p, user_config_directory_name ());
+ if (cachename.empty ()) {
+ p = Glib::build_filename (p, user_config_directory_name ());
+ } else {
+ p = Glib::build_filename (p, cachename);
+ }
#ifdef PLATFORM_WINDOWS
/* On Windows Glib::get_user_data_dir is the folder to use for local
if (s.empty()) {
std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
::exit (1);
- }
+ }
return s;
#endif
}
version = atoi (PROGRAM_VERSION);
}
- return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version, std::dec));
+ return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version));
}