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_picture_asset.cc | |
| parent | 51ae14c7e304d4fbc8d7524d584f3f4762d51f67 (diff) | |
Remove ReelEncryptableAsset and tidy up a bit.
Diffstat (limited to 'src/reel_picture_asset.cc')
| -rw-r--r-- | src/reel_picture_asset.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index ddc6a802..4f7f863f 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -57,8 +57,7 @@ using namespace dcp; ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point) - : ReelFileAsset (asset, asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) - , ReelEncryptableAsset (asset->key_id()) + : ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { @@ -68,7 +67,6 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) : ReelFileAsset (node) - , ReelEncryptableAsset (node) { _frame_rate = Fraction (node->string_child ("FrameRate")); try { @@ -88,9 +86,10 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) xmlpp::Node* ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - auto asset = write_to_cpl_asset (node, standard, hash()); + auto asset = ReelFileAsset::write_to_cpl (node, standard); asset->add_child("FrameRate")->add_child_text(String::compose("%1 %2", _frame_rate.numerator, _frame_rate.denominator)); + if (standard == Standard::INTEROP) { /* Allowed values for this tag from the standard */ @@ -111,26 +110,17 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const } } - asset->add_child ("ScreenAspectRatio")->add_child_text (raw_convert<string> (closest.get(), 2, true)); + asset->add_child("ScreenAspectRatio")->add_child_text(raw_convert<string>(closest.get(), 2, true)); } else { - asset->add_child ("ScreenAspectRatio")->add_child_text ( + asset->add_child("ScreenAspectRatio")->add_child_text( String::compose ("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator) ); } - write_to_cpl_encryptable (asset); - return asset; } -string -ReelPictureAsset::key_type () const -{ - return "MDIK"; -} - - bool ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOptions opt, NoteHandler note) const { |