FIXME: Remove all use of add_child() from xmlpp.

[dcpomatic.git] / src / lib / content.cc

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 97edc7c892c33612263ae14b33e403d3a0b1bd11..6743705d9b94659fd019c7b6286778d0f7d75919 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -93,7 +93,7 @@ Content::Content (cxml::ConstNodePtr node)
                        _last_write_times.push_back (*mod);
                } else {
                        boost::system::error_code ec;
-                       auto last_write = boost::filesystem::last_write_time(i->content(), ec);
+                       auto last_write = dcp::filesystem::last_write_time(i->content(), ec);
                        _last_write_times.push_back (ec ? 0 : last_write);
                }
        }
@@ -140,23 +140,23 @@ Content::Content (vector<shared_ptr<Content>> c)
 
 
 void
-Content::as_xml (xmlpp::Node* node, bool with_paths) const
+Content::as_xml(xmlpp::Element* element, bool with_paths) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
        if (with_paths) {
                for (size_t i = 0; i < _paths.size(); ++i) {
-                       auto p = node->add_child("Path");
+                       auto p = cxml::add_child(element, "Path");
                        p->add_child_text (_paths[i].string());
                        p->set_attribute ("mtime", raw_convert<string>(_last_write_times[i]));
                }
        }
-       node->add_child("Digest")->add_child_text(_digest);
-       node->add_child("Position")->add_child_text(raw_convert<string>(_position.get()));
-       node->add_child("TrimStart")->add_child_text(raw_convert<string>(_trim_start.get()));
-       node->add_child("TrimEnd")->add_child_text(raw_convert<string>(_trim_end.get()));
+       cxml::add_text_child(element, "Digest", _digest);
+       cxml::add_text_child(element, "Position", raw_convert<string>(_position.get()));
+       cxml::add_text_child(element, "TrimStart", raw_convert<string>(_trim_start.get()));
+       cxml::add_text_child(element, "TrimEnd", raw_convert<string>(_trim_end.get()));
        if (_video_frame_rate) {
-               node->add_child("VideoFrameRate")->add_child_text(raw_convert<string>(_video_frame_rate.get()));
+               cxml::add_text_child(element, "VideoFrameRate", raw_convert<string>(_video_frame_rate.get()));
        }
 }
 
@@ -187,7 +187,7 @@ Content::examine (shared_ptr<const Film>, shared_ptr<Job> job)
        _last_write_times.clear ();
        for (auto i: _paths) {
                boost::system::error_code ec;
-               auto last_write = boost::filesystem::last_write_time(i, ec);
+               auto last_write = dcp::filesystem::last_write_time(i, ec);
                _last_write_times.push_back (ec ? 0 : last_write);
        }
 }
@@ -339,7 +339,7 @@ bool
 Content::paths_valid () const
 {
        for (auto i: _paths) {
-               if (!boost::filesystem::exists (i)) {
+               if (!dcp::filesystem::exists(i)) {
                        return false;
                }
        }
@@ -359,7 +359,7 @@ Content::set_paths (vector<boost::filesystem::path> paths)
                _last_write_times.clear ();
                for (auto i: _paths) {
                        boost::system::error_code ec;
-                       auto last_write = boost::filesystem::last_write_time(i, ec);
+                       auto last_write = dcp::filesystem::last_write_time(i, ec);
                        _last_write_times.push_back (ec ? 0 : last_write);
                }
        }
@@ -552,7 +552,7 @@ Content::add_path (boost::filesystem::path p)
        boost::mutex::scoped_lock lm (_mutex);
        _paths.push_back (p);
        boost::system::error_code ec;
-       auto last_write = boost::filesystem::last_write_time(p, ec);
+       auto last_write = dcp::filesystem::last_write_time(p, ec);
        _last_write_times.push_back (ec ? 0 : last_write);
 }
 
@@ -562,7 +562,7 @@ Content::changed () const
 {
        bool write_time_changed = false;
        for (auto i = 0U; i < _paths.size(); ++i) {
-               if (boost::filesystem::last_write_time(_paths[i]) != last_write_time(i)) {
+               if (dcp::filesystem::last_write_time(_paths[i]) != last_write_time(i)) {
                        write_time_changed = true;
                        break;
                }