X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_subtitle_asset.cc;h=7636782f94b9b6fbf8d5a29dacb67cc9f5d067cb;hb=093525165f6397ba9eaffd19833dc978bcb32d55;hp=77c001d5e8a3e30a29eb5144f58251bf3d731071;hpb=b1a47060818175bf222da2ab11f7caec73f5a70c;p=libdcp.git

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index 77c001d5..7636782f 100644
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,61 +31,86 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_subtitle_asset.cc
- *  @brief ReelSubtitleAsset class.
+ *  @brief ReelSubtitleAsset class
  */
 
+
+#include "language_tag.h"
 #include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include <libxml++/libxml++.h>
 
+
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcp;
 
-ReelSubtitleAsset::ReelSubtitleAsset (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>())
+
+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)
+	, ReelEncryptableAsset (asset, dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>())
 {
 
 }
 
-ReelSubtitleAsset::ReelSubtitleAsset (boost::shared_ptr<const cxml::Node> node)
+
+ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<const cxml::Node> node)
 	: ReelAsset (node)
-	, ReelMXF (node)
+	, ReelEncryptableAsset (node)
 {
-	node->ignore_child ("Language");
+	_language = node->optional_string_child("Language");
 	node->done ();
 }
 
+
 string
 ReelSubtitleAsset::cpl_node_name (Standard) const
 {
 	return "MainSubtitle";
 }
 
+
 string
 ReelSubtitleAsset::key_type () const
 {
 	return "MDSK";
 }
 
-void
+
+xmlpp::Node *
 ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	ReelAsset::write_to_cpl (node, standard);
-
-	/* XXX: couldn't this stuff be in the parent class?  All child
-	   classes seem to do the same thing...?
-	*/
-	if (key_id ()) {
-		/* Find <MainSubtitle> */
-		xmlpp::Node* ms = find_child (node, cpl_node_name (standard));
-		/* Find <Hash> */
-		xmlpp::Node* hash = find_child (ms, "Hash");
-		ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ());
+	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;
+}
+
+
+bool
+ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOptions opt, NoteHandler note) const
+{
+	if (!asset_equals (other, opt, note)) {
+		return false;
 	}
+	if (!mxf_equals (other, opt, note)) {
+		return false;
+	}
+
+	return true;
 }
+
+
+void
+ReelSubtitleAsset::set_language (dcp::LanguageTag language)
+{
+	_language = language.to_string();
+}
+