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_picture_asset.cc | |
| parent | ea487953c7e51ec5c16087d739a42981ec9d0ff9 (diff) | |
Move asset refs and hash from ReelAsset to ReelMXF.
Diffstat (limited to 'src/reel_picture_asset.cc')
| -rw-r--r-- | src/reel_picture_asset.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 5eaf9157..d2ba358f 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -54,7 +54,7 @@ using namespace dcp; ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point) : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point) - , ReelMXF (asset->key_id()) + , ReelMXF (asset, asset->key_id()) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { @@ -82,7 +82,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) xmlpp::Node* ReelPictureAsset::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()); asset->add_child("FrameRate")->add_child_text(String::compose("%1 %2", _frame_rate.numerator, _frame_rate.denominator)); if (standard == INTEROP) { @@ -128,9 +128,12 @@ ReelPictureAsset::key_type () const } bool -ReelPictureAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const +ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOptions opt, NoteHandler note) const { - if (!ReelAsset::equals (other, opt, note)) { + if (!asset_equals (other, opt, note)) { + return false; + } + if (!mxf_equals (other, opt, note)) { return false; } |