X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.h;h=fbeeffbc13403614ed5c1a7439975b5c16edefd9;hp=b6bec1c4c200693b5932619e9f0b7497ef9aa2c2;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=47e29203daec51d313ed8ab8ef759752bce18d45

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index b6bec1c4c..fbeeffbc1 100644
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,35 @@
 
 */
 
+
 #ifndef DCPOMATIC_KDM_WITH_METADATA_H
 #define DCPOMATIC_KDM_WITH_METADATA_H
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "encrypted_ecinema_kdm.h"
-#endif
+
 #include <dcp/encrypted_kdm.h>
 #include <dcp/name_format.h>
-#include <boost/shared_ptr.hpp>
+
 
 class Cinema;
 
+
 class KDMWithMetadata
 {
 public:
-	KDMWithMetadata (dcp::NameFormat::Map const& name_values, void const* group, std::list<std::string> emails)
+	KDMWithMetadata(dcp::NameFormat::Map const& name_values, void const* group, std::vector<std::string> emails, dcp::EncryptedKDM kdm)
 		: _name_values (name_values)
 		, _group (group)
 		, _emails (emails)
+		, _kdm (kdm)
 	{}
 
-	virtual ~KDMWithMetadata () {}
+	std::string kdm_as_xml () const {
+		return _kdm.as_xml ();
+	}
 
-	virtual std::string kdm_as_xml () const = 0;
-	virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
+	void kdm_as_xml (boost::filesystem::path out) const {
+		return _kdm.as_xml (out);
+	}
 
 	dcp::NameFormat::Map const& name_values () const {
 		return _name_values;
@@ -54,82 +58,58 @@ public:
 		return _group;
 	}
 
-	std::list<std::string> emails () const {
+	std::vector<std::string> emails() const {
 		return _emails;
 	}
 
 private:
 	dcp::NameFormat::Map _name_values;
 	void const* _group;
-	std::list<std::string> _emails;
+	std::vector<std::string> _emails;
+	dcp::EncryptedKDM _kdm;
 };
 
 
-typedef boost::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
+typedef std::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
 
 
 int write_files (
 	std::list<KDMWithMetadataPtr> screen_kdms, boost::filesystem::path directory,
-	dcp::NameFormat name_format, boost::function<bool (boost::filesystem::path)> confirm_overwrite
+	dcp::NameFormat name_format, std::function<bool (boost::filesystem::path)> confirm_overwrite
 	);
 
 
 void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format);
 
 
-std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr> kdms);
+std::list<std::list<KDMWithMetadataPtr>> collect (std::list<KDMWithMetadataPtr> kdms);
 
 
 int write_directories (
-		std::list<std::list<KDMWithMetadataPtr> > kdms,
+		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
-		boost::function<bool (boost::filesystem::path)> confirm_overwrite
+		std::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
 
 int write_zip_files (
-		std::list<std::list<KDMWithMetadataPtr> > kdms,
+		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
-		boost::function<bool (boost::filesystem::path)> confirm_overwrite
+		std::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
 
-void email (
-		std::list<std::list<KDMWithMetadataPtr> > kdms,
+void send_emails (
+		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
-		std::string cpl_name
+		std::string cpl_name,
+		std::vector<std::string> extra_addresses
 		);
 
-
-template <class T>
-class SpecialKDMWithMetadata : public KDMWithMetadata
-{
-public:
-	SpecialKDMWithMetadata (dcp::NameFormat::Map const& name_values, void const* group, std::list<std::string> emails, T k)
-		: KDMWithMetadata (name_values, group, emails)
-		, kdm (k)
-	{}
-
-	std::string kdm_as_xml () const {
-		return kdm.as_xml ();
-	}
-
-	void kdm_as_xml (boost::filesystem::path out) const {
-		return kdm.as_xml (out);
-	}
-
-	T kdm;
-};
-
-typedef SpecialKDMWithMetadata<dcp::EncryptedKDM> DCPKDMWithMetadata;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-typedef SpecialKDMWithMetadata<EncryptedECinemaKDM> ECinemaKDMWithMetadata;
-#endif
-
 #endif