Remove all use of add_child() from xmlpp.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 204c390ee73285f0622dabab17d286ec0658feaa..6580ac448bc9d80c0c7e83983e1bd5e88fa5fc3d 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -118,15 +118,17 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame)
 }
 
 dcp::Size
-DCPVideo::get_size(void) {
-       auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+DCPVideo::get_size() const
+{
+       auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
        return image->size();
 }
 
-void
-DCPVideo::convert_to_xyz (uint16_t *dst) {
 
-       auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+void
+DCPVideo::convert_to_xyz(uint16_t* dst) const
+{
+       auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
        if (_frame->colour_conversion()) {
                dcp::rgb_to_xyz (
                        image->data()[0],
@@ -138,6 +140,7 @@ DCPVideo::convert_to_xyz (uint16_t *dst) {
        }
 }
 
+
 /** J2K-encode this frame on the local host.
  *  @return Encoded data.
  */
@@ -236,7 +239,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const
        /* Collect all XML metadata */
        xmlpp::Document doc;
        auto root = doc.create_root_node ("EncodingRequest");
-       root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION));
+       cxml::add_text_child(root, "Version", raw_convert<string>(SERVER_LINK_VERSION));
        add_metadata (root);
 
        LOG_DEBUG_ENCODE (N_("Sending frame %1 to remote"), _index);
@@ -275,10 +278,10 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const
 void
 DCPVideo::add_metadata (xmlpp::Element* el) const
 {
-       el->add_child("Index")->add_child_text (raw_convert<string> (_index));
-       el->add_child("FramesPerSecond")->add_child_text (raw_convert<string> (_frames_per_second));
-       el->add_child("J2KBandwidth")->add_child_text (raw_convert<string> (_j2k_bandwidth));
-       el->add_child("Resolution")->add_child_text (raw_convert<string> (int (_resolution)));
+       cxml::add_text_child(el, "Index", raw_convert<string>(_index));
+       cxml::add_text_child(el, "FramesPerSecond", raw_convert<string>(_frames_per_second));
+       cxml::add_text_child(el, "J2KBandwidth", raw_convert<string>(_j2k_bandwidth));
+       cxml::add_text_child(el, "Resolution", raw_convert<string>(int(_resolution)));
        _frame->add_metadata (el);
 }