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

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

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 60327ab0d9d87c0f199215da1f05dda10dd67dd8..800c45eb6b45685d5258169074e77bace1a0eca6 100644 (file)
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -20,14 +20,14 @@
 
 #include "ffmpeg_stream.h"
 #include "dcpomatic_assert.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
 extern "C" {
 #include <libavformat/avformat.h>
 }
+LIBDCP_ENABLE_WARNINGS
 
 using std::string;
 using dcp::raw_convert;
@@ -40,10 +40,10 @@ FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
 }
 
 void
-FFmpegStream::as_xml (xmlpp::Node* root) const
+FFmpegStream::as_xml(xmlpp::Element* root) const
 {
-       root->add_child("Name")->add_child_text (name);
-       root->add_child("Id")->add_child_text (raw_convert<string> (_id));
+       cxml::add_text_child(root, "Name", name);
+       cxml::add_text_child(root, "Id", raw_convert<string>(_id));
 }
 
 bool