summaryrefslogtreecommitdiff
path: root/src/interop_subtitle_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-24 22:38:52 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-24 22:38:52 +0200
commit85c565b56de05e93617a8dfd633d6f9d6e9cb30a (patch)
treeecde1c29df68d91c749fd33ea7e4175a3a3716d6 /src/interop_subtitle_asset.cc
parentec520e1a5ed27b3eb414627acf7ad7f9cd661346 (diff)
Try to remove the PKL object, and make it so that we don't keepdcp-editor2
the PKL assets around after reading them. But verification needs to see those assets, to check the hashes.
Diffstat (limited to 'src/interop_subtitle_asset.cc')
-rw-r--r--src/interop_subtitle_asset.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 798f1cda..993be0ae 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -43,6 +43,7 @@
#include "file.h"
#include "interop_load_font_node.h"
#include "interop_subtitle_asset.h"
+#include "pkl_internal.h"
#include "raw_convert.h"
#include "subtitle_asset_internal.h"
#include "subtitle_image.h"
@@ -282,15 +283,15 @@ InteropSubtitleAsset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::p
void
-InteropSubtitleAsset::add_to_pkl (shared_ptr<PKL> pkl, boost::filesystem::path root) const
+InteropSubtitleAsset::add_to_pkl (vector<PKLAsset>& assets, boost::filesystem::path root, dcp::Standard standard) const
{
- Asset::add_to_pkl (pkl, root);
+ Asset::add_to_pkl (assets, root, standard);
for (auto i: _subtitles) {
auto im = dynamic_pointer_cast<dcp::SubtitleImage> (i);
if (im) {
auto png_image = im->png_image ();
- pkl->add_asset (im->id(), optional<string>(), make_digest(png_image), png_image.size(), "image/png");
+ assets.push_back(PKLAsset(im->id(), optional<string>(), make_digest(png_image), png_image.size(), "image/png"));
}
}
}