Add accessors.

[libdcp.git] / src / reel_closed_caption_asset.cc

diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index 4fb729c679fa47b507c1c25b50c59d9347d31ab5..435c3438c0cb3e45fff5fab6d3515b8719a3b43f 100644 (file)
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -50,8 +50,8 @@ using boost::optional;
 using namespace dcp;
 
 ReelClosedCaptionAsset::ReelClosedCaptionAsset (boost::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
-       : ReelAsset (asset, edit_rate, intrinsic_duration, entry_point)
-       , ReelMXF (dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>())
+       : ReelAsset (asset->id(), edit_rate, intrinsic_duration, entry_point)
+       , ReelMXF (asset, dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>())
 {
 
 }
@@ -60,7 +60,7 @@ ReelClosedCaptionAsset::ReelClosedCaptionAsset (boost::shared_ptr<const cxml::No
        : ReelAsset (node)
        , ReelMXF (node)
 {
-       node->ignore_child ("Language");
+       _language = node->optional_string_child ("Language");
        node->done ();
 }
 
@@ -96,16 +96,33 @@ ReelClosedCaptionAsset::key_type () const
        return "MDSK";
 }
 
-void
+xmlpp::Node *
 ReelClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       ReelAsset::write_to_cpl (node, standard);
+       xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
 
-        if (key_id ()) {
-               /* Find our main tag */
-               xmlpp::Node* ms = find_child (node, cpl_node_name (standard));
+        if (key_id()) {
                /* Find <Hash> */
-               xmlpp::Node* hash = find_child (ms, "Hash");
-               ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ());
+               xmlpp::Node* hash = find_child (asset, "Hash");
+               asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
        }
+
+       if (_language) {
+               asset->add_child("Language")->add_child_text(*_language);
+       }
+
+       return asset;
+}
+
+bool
+ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions opt, NoteHandler note) const
+{
+       if (!asset_equals (other, opt, note)) {
+               return false;
+       }
+       if (!mxf_equals (other, opt, note)) {
+               return false;
+       }
+
+       return true;
 }