rework Stateful::set_state() patch to avoid default version argument

[ardour.git] / libs / pbd / stateful.cc

diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc
index 16aa528f595e271db619ad2a760395056dd41e99..58be141a275a846c523b39e3fd5d9c3e61d4a814 100644 (file)
--- a/libs/pbd/stateful.cc
+++ b/libs/pbd/stateful.cc
@@ -20,13 +20,19 @@
 
 #include <unistd.h>
 
-#include <pbd/stateful.h>
-#include <pbd/xml++.h>
-#include <pbd/error.h>
+#include "pbd/stateful.h"
+#include "pbd/filesystem.h"
+#include "pbd/xml++.h"
+#include "pbd/error.h"
 
 #include "i18n.h"
 
-using namespace PBD;
+using namespace std;
+
+namespace PBD {
+
+int Stateful::current_state_version = 0;
+int Stateful::loading_state_version = 0;
 
 Stateful::Stateful ()
 {
@@ -39,16 +45,14 @@ Stateful::~Stateful ()
        // Do not delete _extra_xml.  The use of add_child_nocopy() 
        // means it needs to live on indefinately.
 
-       if (_instant_xml) {
-               delete _instant_xml;
-       }
+       delete _instant_xml;
 }
 
 void
 Stateful::add_extra_xml (XMLNode& node)
 {
        if (_extra_xml == 0) {
-               _extra_xml = new XMLNode ("extra");
+               _extra_xml = new XMLNode ("Extra");
        }
 
        _extra_xml->remove_nodes (node.name());
@@ -75,17 +79,23 @@ 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)
 {
+       sys::create_directories (directory_path); // may throw
+
        if (_instant_xml == 0) {
                _instant_xml = new XMLNode ("instant");
        }
 
        _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 +111,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 {
@@ -135,3 +148,4 @@ Stateful::instant_xml (const string& str, const string& dir)
        return 0;
 }
 
+} // namespace PBD