From 85c565b56de05e93617a8dfd633d6f9d6e9cb30a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 24 Apr 2022 22:38:52 +0200 Subject: Try to remove the PKL object, and make it so that we don't keep the PKL assets around after reading them. But verification needs to see those assets, to check the hashes. --- src/asset.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/asset.h') diff --git a/src/asset.h b/src/asset.h index 88c7d1d1..0f840b00 100644 --- a/src/asset.h +++ b/src/asset.h @@ -43,7 +43,6 @@ #include "object.h" #include "types.h" -#include "pkl.h" #include #include #include @@ -60,6 +59,9 @@ struct asset_test; namespace dcp { +class PKLAsset; + + /** @class Asset * @brief Parent class for DCP assets, i.e. picture, sound, subtitles, closed captions, CPLs, fonts * @@ -91,7 +93,7 @@ public: virtual void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const; - virtual void add_to_pkl (std::shared_ptr pkl, boost::filesystem::path root) const; + virtual void add_to_pkl (std::vector& assets, boost::filesystem::path root, dcp::Standard standard) const; /** @return the most recent disk file used to read or write this asset, if there is one */ boost::optional file () const { -- cgit v1.2.3