X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_subtitle_asset.cc;h=e3ca20065150c88f8f804aa216f48ba7e9b1f53b;hb=488e3d1bd5e6b17d49f6db4df14c64f4b64db89b;hp=1bb8cccac7bfbceab43651c71c531e604d911b57;hpb=2d60083498861ac30c751dbf0ca387573df6dc68;p=libdcp.git

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index 1bb8ccca..e3ca2006 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,71 +31,83 @@
     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 (asset, 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)
+	: 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 (boost::shared_ptr<const cxml::Node> node)
-	: ReelAsset (node)
-	, ReelMXF (node)
+
+ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<const cxml::Node> node)
+	: ReelFileAsset (node)
 {
-	node->ignore_child ("Language");
-	node->done ();
+	_language = node->optional_string_child("Language");
 }
 
+
 string
 ReelSubtitleAsset::cpl_node_name (Standard) const
 {
 	return "MainSubtitle";
 }
 
-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)
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
-
-	if (key_id ()) {
-		/* Find <Hash> */
-		xmlpp::Node* hash = find_child (asset, "Hash");
-		asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
-	}
-
-	return asset;
+	_language = language.to_string();
 }
 
+
 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)) {
+	if (!file_asset_equals (other, opt, note)) {
 		return false;
 	}
 
 	return true;
 }
+
+
+xmlpp::Node *
+ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
+{
+	auto asset = ReelFileAsset::write_to_cpl (node, standard);
+	if (_language) {
+		asset->add_child("Language")->add_child_text(*_language);
+	}
+	return asset;
+}
+
+