diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
| commit | 488e3d1bd5e6b17d49f6db4df14c64f4b64db89b (patch) | |
| tree | 641fcf167b845df6eca68c54fdf1110a7a07a739 /src/reel_smpte_closed_caption_asset.cc | |
| parent | 51ae14c7e304d4fbc8d7524d584f3f4762d51f67 (diff) | |
Remove ReelEncryptableAsset and tidy up a bit.
Diffstat (limited to 'src/reel_smpte_closed_caption_asset.cc')
| -rw-r--r-- | src/reel_smpte_closed_caption_asset.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/reel_smpte_closed_caption_asset.cc b/src/reel_smpte_closed_caption_asset.cc index 44125037..34fba18b 100644 --- a/src/reel_smpte_closed_caption_asset.cc +++ b/src/reel_smpte_closed_caption_asset.cc @@ -50,7 +50,6 @@ using namespace dcp; ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point) : ReelClosedCaptionAsset (asset, edit_rate, intrinsic_duration, entry_point) - , ReelEncryptableAsset (asset->key_id()) { } @@ -58,7 +57,6 @@ ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<SMPTESubtit ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<const cxml::Node> node) : ReelClosedCaptionAsset (node) - , ReelEncryptableAsset (node) { node->done (); } @@ -67,13 +65,10 @@ ReelSMPTEClosedCaptionAsset::ReelSMPTEClosedCaptionAsset (shared_ptr<const cxml: xmlpp::Node * ReelSMPTEClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - auto asset = write_to_cpl_asset (node, standard, hash()); - write_to_cpl_encryptable (asset); - + auto asset = ReelClosedCaptionAsset::write_to_cpl (node, standard); if (_language) { asset->add_child("Language", "tt")->add_child_text(*_language); } - return asset; } |