diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-11 00:10:30 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-11 20:50:08 +0200 |
| commit | 1a284b7c409567b6ecb223adece779487f70ac92 (patch) | |
| tree | f36367b4444037e09b0224da3ea76dfcb248c241 /src/reel_closed_caption_asset.cc | |
| parent | 093525165f6397ba9eaffd19833dc978bcb32d55 (diff) | |
Extract some parts of ReelEncryptableAsset into ReelFileAsset
Diffstat (limited to 'src/reel_closed_caption_asset.cc')
| -rw-r--r-- | src/reel_closed_caption_asset.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc index 2bc5f3e0..fe0945e3 100644 --- a/src/reel_closed_caption_asset.cc +++ b/src/reel_closed_caption_asset.cc @@ -55,7 +55,8 @@ using namespace dcp; ReelClosedCaptionAsset::ReelClosedCaptionAsset (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>()) + , ReelFileAsset (asset) + , ReelEncryptableAsset (dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>()) { } @@ -63,6 +64,7 @@ ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<SubtitleAsset> a ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node> node) : ReelAsset (node) + , ReelFileAsset (node) , ReelEncryptableAsset (node) { _language = node->optional_string_child ("Language"); @@ -132,7 +134,7 @@ ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, if (!asset_equals (other, opt, note)) { return false; } - if (!mxf_equals (other, opt, note)) { + if (!file_asset_equals (other, opt, note)) { return false; } |