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_picture_asset.cc | |
| parent | 093525165f6397ba9eaffd19833dc978bcb32d55 (diff) | |
Extract some parts of ReelEncryptableAsset into ReelFileAsset
Diffstat (limited to 'src/reel_picture_asset.cc')
| -rw-r--r-- | src/reel_picture_asset.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 8a8b5219..cc5e2399 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -58,7 +58,8 @@ using namespace dcp; ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point) : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) - , ReelEncryptableAsset (asset, asset->key_id()) + , ReelFileAsset (asset) + , ReelEncryptableAsset (asset->key_id()) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { @@ -68,6 +69,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) : ReelAsset (node) + , ReelFileAsset (node) , ReelEncryptableAsset (node) { _frame_rate = Fraction (node->string_child ("FrameRate")); @@ -137,7 +139,7 @@ ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOpti if (!asset_equals (other, opt, note)) { return false; } - if (!mxf_equals (other, opt, note)) { + if (!file_asset_equals (other, opt, note)) { return false; } |