diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-13 01:38:56 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-13 01:38:56 +0200 |
| commit | 51ae14c7e304d4fbc8d7524d584f3f4762d51f67 (patch) | |
| tree | 3c27f3924ddb4b982338384ae759e858d6cc697b /src/reel_picture_asset.cc | |
| parent | ee23803a3dced33ae93346dd1e5cb6453d873023 (diff) | |
Make ReelAsset the parent of ReelFileAsset.
Diffstat (limited to 'src/reel_picture_asset.cc')
| -rw-r--r-- | src/reel_picture_asset.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 8b439003..ddc6a802 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) - : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) - , ReelFileAsset (asset) + : ReelFileAsset (asset, asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) , ReelEncryptableAsset (asset->key_id()) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) @@ -68,8 +67,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) - : ReelAsset (node) - , ReelFileAsset (node) + : ReelFileAsset (node) , ReelEncryptableAsset (node) { _frame_rate = Fraction (node->string_child ("FrameRate")); |