From fa507ea166b8339bcf029ca73a487e7553fb5eb6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 Sep 2013 20:04:11 +0100
Subject: Simplify KDM API slightly.

---
 src/kdm.cc | 6 +++---
 src/kdm.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/kdm.cc b/src/kdm.cc
index b9e598b9..dde5db1c 100644
--- a/src/kdm.cc
+++ b/src/kdm.cc
@@ -89,7 +89,7 @@ KDM::KDM (boost::filesystem::path kdm, boost::filesystem::path private_key)
 KDM::KDM (
 	shared_ptr<const CPL> cpl, shared_ptr<const Signer> signer, shared_ptr<const Certificate> recipient_cert,
 	boost::posix_time::ptime not_valid_before, boost::posix_time::ptime not_valid_after,
-	MXFMetadata mxf_metadata, XMLMetadata xml_metadata
+	string annotation_text, string issue_date
 	)
 	: xml_kdm (new xml::DCinemaSecurityMessage)
 {
@@ -99,8 +99,8 @@ KDM::KDM (
 
 	apu.message_id = "urn:uuid:" + make_uuid ();
 	apu.message_type = "http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type";
-	apu.annotation_text = mxf_metadata.product_name;
-	apu.issue_date = xml_metadata.issue_date;
+	apu.annotation_text = annotation_text;
+	apu.issue_date = issue_date;
 	apu.signer.x509_issuer_name = signer->certificates().leaf()->issuer ();
 	apu.signer.x509_serial_number = signer->certificates().leaf()->serial ();
 	apu.recipient.x509_issuer_serial.x509_issuer_name = recipient_cert->issuer ();
diff --git a/src/kdm.h b/src/kdm.h
index 90ed3b9c..cee9db21 100644
--- a/src/kdm.h
+++ b/src/kdm.h
@@ -99,7 +99,7 @@ public:
 	KDM (
 		boost::shared_ptr<const CPL> cpl, boost::shared_ptr<const Signer>, boost::shared_ptr<const Certificate> recipient_cert,
 		boost::posix_time::ptime not_valid_before, boost::posix_time::ptime not_valid_after,
-		MXFMetadata mxf_metadata, XMLMetadata xml_metadata
+		std::string annotation_text, std::string issue_date
 		);
 
 	std::list<KDMKey> keys () const {
-- 
cgit v1.2.3