From 4b2b565a03f26c399960416efeed300dd80e401b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Sep 2020 00:53:55 +0200 Subject: Adapt for changes in parent branch, and test churn. --- src/combine.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/combine.h') diff --git a/src/combine.h b/src/combine.h index 5d40d4d1..3d8a6284 100644 --- a/src/combine.h +++ b/src/combine.h @@ -32,6 +32,8 @@ */ +#include "compose.hpp" +#include "version.h" #include @@ -39,7 +41,15 @@ namespace dcp { class CertificateChain; -void combine (std::vector inputs, boost::filesystem::path output, boost::shared_ptr signer = boost::shared_ptr()); +void combine ( + std::vector inputs, + boost::filesystem::path output, + std::string issuer = String::compose("libdcp %1", dcp::version), + std::string creator = String::compose("libdcp %1", dcp::version), + std::string issue_date = LocalTime().as_string(), + std::string annotation_text = String::compose("Created by libdcp %1", dcp::version), + boost::shared_ptr signer = boost::shared_ptr() + ); } -- cgit v1.2.3