Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / reel_smpte_closed_caption_asset.cc

diff --git a/src/reel_smpte_closed_caption_asset.cc b/src/reel_smpte_closed_caption_asset.cc
index 441250376f2266b8b795734f511a7a5e4f330665..70e5eb365d38998a6c8c01c4d410151217ab2014 100644 (file)
--- a/src/reel_smpte_closed_caption_asset.cc
+++ b/src/reel_smpte_closed_caption_asset.cc
@@ -38,7 +38,10 @@
 
 
 #include "reel_smpte_closed_caption_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::make_pair;
@@ -50,7 +53,6 @@ using namespace dcp;
 
 ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
        : ReelClosedCaptionAsset (asset, edit_rate, intrinsic_duration, entry_point)
-       , ReelEncryptableAsset (asset->key_id())
 {
 
 }
@@ -58,22 +60,18 @@ ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<SMPTESubtit
 
 ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<const cxml::Node> node)
        : ReelClosedCaptionAsset (node)
-       , ReelEncryptableAsset (node)
 {
        node->done ();
 }
 
 
-xmlpp::Node *
-ReelSMPTEClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
+xmlpp::Element*
+ReelSMPTEClosedCaptionAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
 {
-       auto asset = write_to_cpl_asset (node, standard, hash());
-       write_to_cpl_encryptable (asset);
-
+       auto asset = ReelClosedCaptionAsset::write_to_cpl (node, standard);
        if (_language) {
-               asset->add_child("Language", "tt")->add_child_text(*_language);
+               cxml::add_child(asset, "Language", string("tt"))->add_child_text(*_language);
        }
-
        return asset;
 }