smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

Replace use of PBD::sys::path in ARDOUR::user_config_directory

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12837 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:07:14 +00:00
parent 78c30ae9e4
commit a39990dee0
1 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libs/ardour/filesystem_paths.cc
View file

@ -21,7 +21,6 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/filesystem.h"
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
@ -40,12 +39,10 @@ using std::string;
std::string std::string
user_config_directory () user_config_directory ()
{ {
sys::path p; std::string p;
#ifdef __APPLE__ #ifdef __APPLE__
p = Glib::get_home_dir(); p = Glib::build_filename (Glib::get_home_dir(), "Library/Preferences");
p /= "Library/Preferences";
#else #else
const char* c = 0; const char* c = 0;
@ -58,36 +55,30 @@ user_config_directory ()
const string home_dir = Glib::get_home_dir(); const string home_dir = Glib::get_home_dir();
if (home_dir.empty ()) { if (home_dir.empty ()) {
const string error_msg = "Unable to determine home directory"; error << "Unable to determine home directory" << endmsg;
exit (1);
// log the error
error << error_msg << endmsg;
throw sys::filesystem_error(error_msg);
} }
p = home_dir; p = home_dir;
p /= ".config"; p = Glib::build_filename (p, ".config");
} }
#endif #endif
p /= user_config_dir_name; p = Glib::build_filename (p, user_config_dir_name);
std::string ps (p.to_string()); if (!Glib::file_test (p, Glib::FILE_TEST_EXISTS)) {
if (g_mkdir_with_parents (p.c_str(), 0755)) {
if (!Glib::file_test (ps, Glib::FILE_TEST_EXISTS)) {
if (g_mkdir_with_parents (ps.c_str(), 0755)) {
error << string_compose (_("Cannot create Configuration directory %1 - cannot run"), error << string_compose (_("Cannot create Configuration directory %1 - cannot run"),
ps) << endmsg; p) << endmsg;
exit (1); exit (1);
} }
} else if (!Glib::file_test (ps, Glib::FILE_TEST_IS_DIR)) { } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"), error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
ps) << endmsg; p) << endmsg;
exit (1); exit (1);
} }
return p.to_string(); return p;
} }
std::string std::string