Add ARDOUR::user_config_directory in new header ardour/filesystem_paths.h

git-svn-id: svn://localhost/ardour2/trunk@2041 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index f56d85f088a4c264d615ba6c88835a5eab476d83..1d66b1f6be3e1a033a392e7e3e01f8236d4bbe88 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -32,6 +32,7 @@ chan_count.cc
 diskstream.cc
 directory_names.cc
 filename_extensions.cc
+filesystem_paths.cc
 find_session.cc
 template_utils.cc
 track.cc

diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
index 25f468b15f53c1e672102a61dbd3dec800fa3dfc..8fabe025d12095871af1acd2abe830062ef9db76 100644 (file)
--- a/libs/ardour/ardour/directory_names.h
+++ b/libs/ardour/ardour/directory_names.h
@@ -16,6 +16,7 @@ extern const char* const peak_dir_name;
 extern const char* const export_dir_name;
 extern const char* const templates_dir_name;
 extern const char* const surfaces_dir_name;
+extern const char* const user_config_dir_name;
 
 };
 

diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
new file mode 100644 (file)
index 0000000..dc0d257
--- /dev/null
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2007 Tim Mayberry 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef ARDOUR_FILESYSTEM_PATHS_INCLUDED
+#define ARDOUR_FILESYSTEM_PATHS_INCLUDED
+
+#include <pbd/filesystem.h>
+
+namespace ARDOUR {
+
+       using namespace PBD;
+       
+       /**
+        * @return the path to the directory used to store user specific ardour
+        * configuration files.
+        */
+       sys::path user_config_directory ();
+
+} // namespace ARDOUR
+
+#endif

diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index dfd794a2a9421d12934bbe20ada378ba3992402f..2a02638db1a355549dbd67b575afffac563de5c8 100644 (file)
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -14,5 +14,6 @@ const char* const interchange_dir_name = X_("interchange");
 const char* const export_dir_name = X_("export");
 const char* const templates_dir_name = X_("templates");
 const char* const surfaces_dir_name = X_("surfaces");
+const char* const user_config_dir_name = X_(".ardour2");
 
 }

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
new file mode 100644 (file)
index 0000000..55a8a99
--- /dev/null
+++ b/libs/ardour/filesystem_paths.cc
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2007 Tim Mayberry 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <pbd/error.h>
+
+#include <glibmm/miscutils.h>
+
+#include <ardour/directory_names.h>
+#include <ardour/filesystem_paths.h>
+
+namespace ARDOUR {
+
+using std::string;
+
+sys::path
+user_config_directory ()
+{
+       const string home_dir = Glib::get_home_dir ();
+
+       if (home_dir.empty ())
+       {
+               const string error_msg = "Unable to determine home directory";
+
+               // log the error
+               error << error_msg << endmsg;
+
+               throw sys::filesystem_error(error_msg);
+       }
+
+       sys::path p(home_dir);
+       p /= user_config_dir_name;
+
+       return p;
+}
+
+} // namespace ARDOUR