Make similar changes to the previous commit for _xml_id.

[libdcp.git] / src / reel_asset.cc

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index cd54ccba753f43fc93a11fcfb2ecfb2efc185063..d233ee649ee20a7e8e598e69940bb15491586d8b 100644 (file)
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -37,13 +37,16 @@
  */
 
 
-#include "raw_convert.h"
-#include "reel_asset.h"
 #include "asset.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "raw_convert.h"
+#include "reel_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::pair;
@@ -78,7 +81,7 @@ ReelAsset::ReelAsset (shared_ptr<const cxml::Node> node)
 
 
 xmlpp::Node*
-ReelAsset::write_to_cpl_asset (xmlpp::Node* node, Standard standard, optional<string> hash) const
+ReelAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
        auto a = node->add_child (cpl_node_name (standard));
        auto const attr = cpl_node_attribute (standard);
@@ -99,9 +102,6 @@ ReelAsset::write_to_cpl_asset (xmlpp::Node* node, Standard standard, optional<st
        if (_duration) {
                a->add_child("Duration")->add_child_text(raw_convert<string>(*_duration));
        }
-       if (hash) {
-               a->add_child("Hash")->add_child_text (hash.get());
-       }
        return a;
 }