Make similar changes to the previous commit for _xml_id.

[libdcp.git] / src / reel_smpte_subtitle_asset.cc

diff --git a/src/reel_smpte_subtitle_asset.cc b/src/reel_smpte_subtitle_asset.cc
index 0cd38c21e2f4d6190d2c5f6b15b2e22e35ac0f72..64440547ce036fff99cf7f11eb77a233fae15679 100644 (file)
--- a/src/reel_smpte_subtitle_asset.cc
+++ b/src/reel_smpte_subtitle_asset.cc
@@ -39,7 +39,10 @@
 
 #include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
@@ -50,7 +53,6 @@ using namespace dcp;
 
 ReelSMPTESubtitleAsset::ReelSMPTESubtitleAsset (shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
        : ReelSubtitleAsset (asset, edit_rate, intrinsic_duration, entry_point)
-       , ReelEncryptableAsset (asset->key_id())
 {
 
 }
@@ -58,20 +60,7 @@ ReelSMPTESubtitleAsset::ReelSMPTESubtitleAsset (shared_ptr<SMPTESubtitleAsset> a
 
 ReelSMPTESubtitleAsset::ReelSMPTESubtitleAsset (shared_ptr<const cxml::Node> node)
        : ReelSubtitleAsset (node)
-       , ReelEncryptableAsset (node)
 {
        node->done ();
 }
 
-
-xmlpp::Node *
-ReelSMPTESubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
-{
-       auto asset = write_to_cpl_asset (node, standard, _hash);
-       write_to_cpl_encryptable (asset);
-       if (_language) {
-               asset->add_child("Language")->add_child_text(*_language);
-       }
-       return asset;
-}
-