Remove all use of add_child() from xmlpp.

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

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 72698fa51cc49b2a947abde2fedf87ed2d461cd8..3f43b6ec5773fe130873930d84c87f323c3e733e 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -19,12 +19,11 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
@@ -43,22 +42,22 @@ FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version
 {
        if (version >= 33) {
                boost::mutex::scoped_lock lm (_mutex);
-               BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Colour")) {
+               for (auto i: node->node_children ("Colour")) {
                        _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
                }
        }
 }
 
 void
-FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
+FFmpegSubtitleStream::as_xml(xmlpp::Element* root) const
 {
-       FFmpegStream::as_xml (root);
+       FFmpegStream::as_xml(root);
 
        boost::mutex::scoped_lock lm (_mutex);
        for (map<RGBA, RGBA>::const_iterator i = _colours.begin(); i != _colours.end(); ++i) {
-               xmlpp::Node* node = root->add_child("Colour");
-               i->first.as_xml (node->add_child("From"));
-               i->second.as_xml (node->add_child("To"));
+               auto node = cxml::add_child(root, "Colour");
+               i->first.as_xml(cxml::add_child(node, "From"));
+               i->second.as_xml(cxml::add_child(node, "To"));
        }
 }