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

[libdcp.git] / src / reel_subtitle_asset.cc

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index cccda50a4a23bcadd3f92a68a7e4d155bd4b5bc8..436aa69f6c84458589d5c7eee36c37ed5770949b 100644 (file)
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -38,10 +38,13 @@
 
 
 #include "language_tag.h"
-#include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
+#include "subtitle_asset.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
@@ -52,21 +55,23 @@ using namespace dcp;
 
 
 ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
-       : ReelAsset (asset->id(), edit_rate, intrinsic_duration, entry_point)
-       , ReelFileAsset (asset)
-       , ReelEncryptableAsset (dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>())
+       : ReelFileAsset (
+               asset,
+               dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : boost::none,
+               asset->id(),
+               edit_rate,
+               intrinsic_duration,
+               entry_point
+               )
 {
 
 }
 
 
 ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<const cxml::Node> node)
-       : ReelAsset (node)
-       , ReelFileAsset (node)
-       , ReelEncryptableAsset (node)
+       : ReelFileAsset (node)
 {
        _language = node->optional_string_child("Language");
-       node->done ();
 }
 
 
@@ -77,27 +82,15 @@ ReelSubtitleAsset::cpl_node_name (Standard) const
 }
 
 
-string
-ReelSubtitleAsset::key_type () const
-{
-       return "MDSK";
-}
-
-
-xmlpp::Node *
-ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
+void
+ReelSubtitleAsset::set_language (dcp::LanguageTag language)
 {
-       auto asset = write_to_cpl_asset (node, standard, hash());
-       write_to_cpl_mxf (asset);
-       if (_language) {
-               asset->add_child("Language")->add_child_text(*_language);
-       }
-       return asset;
+       _language = language.to_string();
 }
 
 
 bool
-ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelSubtitleAsset::equals(shared_ptr<const ReelSubtitleAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;
@@ -110,9 +103,14 @@ ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOp
 }
 
 
-void
-ReelSubtitleAsset::set_language (dcp::LanguageTag language)
+xmlpp::Element *
+ReelSubtitleAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
 {
-       _language = language.to_string();
+       auto asset = ReelFileAsset::write_to_cpl (node, standard);
+       if (_language) {
+               cxml::add_text_child(asset, "Language", *_language);
+       }
+       return asset;
 }
 
+