diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-15 00:49:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-17 00:24:27 +0000 |
| commit | 2d60083498861ac30c751dbf0ca387573df6dc68 (patch) | |
| tree | e98e7631415074b492d1422149f10f6e55367a42 /src/reel_closed_caption_asset.cc | |
| parent | ea487953c7e51ec5c16087d739a42981ec9d0ff9 (diff) | |
Move asset refs and hash from ReelAsset to ReelMXF.
Diffstat (limited to 'src/reel_closed_caption_asset.cc')
| -rw-r--r-- | src/reel_closed_caption_asset.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc index b7629011..f71c39f6 100644 --- a/src/reel_closed_caption_asset.cc +++ b/src/reel_closed_caption_asset.cc @@ -51,7 +51,7 @@ using namespace dcp; ReelClosedCaptionAsset::ReelClosedCaptionAsset (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>()) + , ReelMXF (asset, dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : optional<string>()) { } @@ -99,7 +99,7 @@ ReelClosedCaptionAsset::key_type () const xmlpp::Node * ReelClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - xmlpp::Node* asset = ReelAsset::write_to_cpl (node, standard); + xmlpp::Node* asset = write_to_cpl_base (node, standard, hash()); if (key_id()) { /* Find <Hash> */ @@ -113,3 +113,16 @@ ReelClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) cons return asset; } + +bool +ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions opt, NoteHandler note) const +{ + if (!asset_equals (other, opt, note)) { + return false; + } + if (!mxf_equals (other, opt, note)) { + return false; + } + + return true; +} |