Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / reel_subtitle_asset.cc

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index e75b918afc8d01de9b866c8a821c3f917cdb42e8..e3ca20065150c88f8f804aa216f48ba7e9b1f53b 100644 (file)
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -52,19 +52,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, 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)
+       : ReelFileAsset (node)
 {
        _language = node->optional_string_child("Language");
-       node->done ();
 }
 
 
@@ -75,22 +79,10 @@ 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();
 }
 
 
@@ -100,7 +92,7 @@ ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOp
        if (!asset_equals (other, opt, note)) {
                return false;
        }
-       if (!mxf_equals (other, opt, note)) {
+       if (!file_asset_equals (other, opt, note)) {
                return false;
        }
 
@@ -108,9 +100,14 @@ ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOp
 }
 
 
-void
-ReelSubtitleAsset::set_language (dcp::LanguageTag language)
+xmlpp::Node *
+ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       _language = language.to_string();
+       auto asset = ReelFileAsset::write_to_cpl (node, standard);
+       if (_language) {
+               asset->add_child("Language")->add_child_text(*_language);
+       }
+       return asset;
 }
 
+