X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.h;h=fbeeffbc13403614ed5c1a7439975b5c16edefd9;hb=HEAD;hp=2e07334de7eca49e85c96899ffe6d739b0270637;hpb=a332bd6be323f03dad5b180fb237afe54f1bf81e;p=dcpomatic.git

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index 2e07334de..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,19 +18,22 @@
 
 */
 
+
 #ifndef DCPOMATIC_KDM_WITH_METADATA_H
 #define DCPOMATIC_KDM_WITH_METADATA_H
 
+
 #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, dcp::EncryptedKDM kdm)
+	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)
@@ -55,56 +58,57 @@ 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
 		);
 
 #endif