summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-12-28 01:25:57 +0100
committerCarl Hetherington <cth@carlh.net>2024-04-14 22:48:35 +0200
commitd1dd43787960cd7974e24be5f8d73fe83a0e6c9a (patch)
tree3fae75b0aeb25ee7c6d49fe0befd793065f90cc6 /src
parentd5aa7509cd1b50be5b6a929e00a2572b30585629 (diff)
Make verified DCPs available on the return from dcp::verify().
Diffstat (limited to 'src')
-rw-r--r--src/verify.cc4
-rw-r--r--src/verify.h12
2 files changed, 13 insertions, 3 deletions
diff --git a/src/verify.cc b/src/verify.cc
index ba0007db..0003e0a6 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1810,7 +1810,7 @@ verify_assetmap(Context& context, shared_ptr<const DCP> dcp)
}
-vector<VerificationNote>
+dcp::VerifyResult
dcp::verify (
vector<boost::filesystem::path> directories,
vector<dcp::DecryptedKDM> kdms,
@@ -1891,7 +1891,7 @@ dcp::verify (
}
}
- return notes;
+ return { notes, dcps };
}
diff --git a/src/verify.h b/src/verify.h
index 2adb47d2..77c5392b 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -58,6 +58,9 @@
namespace dcp {
+class DCP;
+
+
class VerificationNote
{
public:
@@ -659,7 +662,14 @@ struct VerificationOptions
};
-std::vector<VerificationNote> verify (
+struct VerifyResult
+{
+ std::vector<VerificationNote> notes;
+ std::vector<std::shared_ptr<dcp::DCP>> dcps;
+};
+
+
+VerifyResult verify(
std::vector<boost::filesystem::path> directories,
std::vector<dcp::DecryptedKDM> kdms,
boost::function<void (std::string, boost::optional<boost::filesystem::path>)> stage,