Adapt for changes in parent branch, and test churn.

2 files changed, 21 insertions, 3 deletions

diff --git a/src/combine.cc b/src/combine.cc
index 0e262fce..65cd3d0b 100644
--- a/src/combine.cc
+++ b/src/combine.cc
@@ -94,7 +94,15 @@ create_hard_link_or_copy (boost::filesystem::path from, boost::filesystem::path
 
 
 void
-dcp::combine (vector<boost::filesystem::path> inputs, boost::filesystem::path output, shared_ptr<const CertificateChain> signer)
+dcp::combine (
+	vector<boost::filesystem::path> inputs,
+	boost::filesystem::path output,
+	string issuer,
+	string creator,
+	string issue_date,
+	string annotation_text,
+	shared_ptr<const CertificateChain> signer
+	)
 {
 	using namespace boost::filesystem;
 
@@ -161,5 +169,5 @@ dcp::combine (vector<boost::filesystem::path> inputs, boost::filesystem::path ou
 	}
 
 	output_dcp.resolve_refs (assets);
-	output_dcp.write_xml (*standard, dcp::XMLMetadata(), signer);
+	output_dcp.write_xml (*standard, issuer, creator, issue_date, annotation_text, signer);
 }
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 <boost/filesystem.hpp>
 
 
@@ -39,7 +41,15 @@ namespace dcp {
 
 class CertificateChain;
 
-void combine (std::vector<boost::filesystem::path> inputs, boost::filesystem::path output, boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<CertificateChain>());
+void combine (
+	std::vector<boost::filesystem::path> 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<const CertificateChain> signer = boost::shared_ptr<CertificateChain>()
+	);
 
 }