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

Allow to construct a XML tree from a text buffer

Browse source
This commit is contained in:
Robin Gareus 2016-10-29 17:03:34 +02:00
parent 5ed764178a
commit 06700cb2f4
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/pbd/pbd/xml++.h
View file

@ -70,7 +70,7 @@ public:
bool read(const std::string& fn) { set_filename(fn); return read_internal(false); } bool read(const std::string& fn) { set_filename(fn); return read_internal(false); }
bool read_and_validate() { return read_internal(true); } bool read_and_validate() { return read_internal(true); }
bool read_and_validate(const std::string& fn) { set_filename(fn); return read_internal(true); } bool read_and_validate(const std::string& fn) { set_filename(fn); return read_internal(true); }
bool read_buffer(const std::string&); bool read_buffer(const std::string&, bool to_tree_doc = false);
bool write() const; bool write() const;
bool write(const std::string& fn) { set_filename(fn); return write(); } bool write(const std::string& fn) { set_filename(fn); return write(); }

11
libs/pbd/xml++.cc
View file

@ -120,7 +120,7 @@ XMLTree::read_internal(bool validate)
} }
bool bool
XMLTree::read_buffer(const string& buffer) XMLTree::read_buffer(const string& buffer, bool to_tree_doc)
{ {
xmlDocPtr doc; xmlDocPtr doc;
@ -135,7 +135,14 @@ XMLTree::read_buffer(const string& buffer)
} }
_root = readnode(xmlDocGetRootElement(doc)); _root = readnode(xmlDocGetRootElement(doc));
xmlFreeDoc(doc); if (to_tree_doc) {
if (_doc) {
xmlFreeDoc (_doc);
}
_doc = doc;
} else {
xmlFreeDoc (doc);
}
return true; return true;
} }