Modify PBD::Stateful::add_instant_xml/instant_xml to take a PBD::sys::path instead...

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

diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index 062f30b700b63b5b576171192386528670c8d29c..25ff635556fb0192f80ace30e3709c7896a4d580 100644 (file)
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -22,6 +22,7 @@
 
 #include <pbd/failed_constructor.h>
 #include <pbd/xml++.h>
+#include <pbd/filesystem.h>
 
 #include <ardour/ardour.h>
 #include <ardour/configuration.h>

diff --git a/libs/pbd/pbd/stateful.h b/libs/pbd/pbd/stateful.h
index 6866450cd2d1232f456a4a0ba387df2dcf906dfc..8ea647475aa5847d24987b1fb8f7a016db4be8b8 100644 (file)
--- a/libs/pbd/pbd/stateful.h
+++ b/libs/pbd/pbd/stateful.h
@@ -27,6 +27,10 @@ class XMLNode;
 
 namespace PBD {
 
+namespace sys {
+       class path;
+}
+
 class Stateful {
   public:
        Stateful();
@@ -45,8 +49,8 @@ class Stateful {
 
   protected:
 
-       void add_instant_xml (XMLNode&, const std::string& dir);
-       XMLNode *instant_xml (const std::string& str, const std::string& dir);
+       void add_instant_xml (XMLNode&, const sys::path& directory_path);
+       XMLNode *instant_xml (const std::string& str, const sys::path& directory_path);
 
        XMLNode *_extra_xml;
        XMLNode *_instant_xml;

diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc
index 175a9c77bd0c321779ab441387f76158950cc153..691c03fbad610ea11d03c88e5973ec07fe52e378 100644 (file)
--- a/libs/pbd/stateful.cc
+++ b/libs/pbd/stateful.cc
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include <pbd/stateful.h>
+#include <pbd/filesystem.h>
 #include <pbd/xml++.h>
 #include <pbd/error.h>
 
@@ -75,7 +76,7 @@ Stateful::extra_xml (const string& str)
 }
 
 void
-Stateful::add_instant_xml (XMLNode& node, const string& dir)
+Stateful::add_instant_xml (XMLNode& node, const sys::path& directory_path)
 {
        if (_instant_xml == 0) {
                _instant_xml = new XMLNode ("instant");
@@ -83,9 +84,13 @@ Stateful::add_instant_xml (XMLNode& node, const string& dir)
 
        _instant_xml->remove_nodes_and_delete (node.name());
        _instant_xml->add_child_copy (node);
+
+       sys::path instant_xml_path(directory_path);
+
+       instant_xml_path /= "instant.xml";
        
        XMLTree tree;
-       tree.set_filename(dir+"/instant.xml");
+       tree.set_filename(instant_xml_path.to_string());
 
        /* Important: the destructor for an XMLTree deletes
           all of its nodes, starting at _root. We therefore
@@ -101,21 +106,24 @@ Stateful::add_instant_xml (XMLNode& node, const string& dir)
        tree.set_root (copy);
 
        if (!tree.write()) {
-               error << string_compose(_("Error: could not write %1"), dir+"/instant.xml") << endmsg;
+               error << string_compose(_("Error: could not write %1"), instant_xml_path.to_string()) << endmsg;
        }
 }
 
 XMLNode *
-Stateful::instant_xml (const string& str, const string& dir)
+Stateful::instant_xml (const string& str, const sys::path& directory_path)
 {
        if (_instant_xml == 0) {
-               string instant_file = dir + "/instant.xml";
-               if (access(instant_file.c_str(), F_OK) == 0) {
+
+               sys::path instant_xml_path(directory_path);
+               instant_xml_path /= "instant.xml";
+
+               if (exists(instant_xml_path)) {
                        XMLTree tree;
-                       if (tree.read(dir+"/instant.xml")) {
+                       if (tree.read(instant_xml_path.to_string())) {
                                _instant_xml = new XMLNode(*(tree.root()));
                        } else {
-                               warning << string_compose(_("Could not understand XML file %1"), instant_file) << endmsg;
+                               warning << string_compose(_("Could not understand XML file %1"), instant_xml_path.to_string()) << endmsg;
                                return 0;
                        }
                } else {