X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.h;h=621254e0fc8a82ae953e0167499e30334b10237f;hb=7274622a833c05eee36b7e59d8ec2ca3e136d140;hp=bfb4d6c522837ef07f4ee34a7522ee95e60bd345;hpb=fe9d2a290682021cd12a00bf21fa4db3012e2049;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index bfb4d6c52..621254e0f 100644
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,34 +18,52 @@
 
 */
 
+
 #include "job.h"
-#include "kdm_name_format.h"
+#include "kdm_with_metadata.h"
 #include <dcp/types.h>
+#include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
+#include <vector>
+
+
+namespace dcpomatic {
+	class Screen;
+}
+
 
-class Screen;
-class CinemaKDMs;
 class Log;
 
+
 class SendKDMEmailJob : public Job
 {
 public:
 	SendKDMEmailJob (
-		std::list<CinemaKDMs> cinema_kdms,
-		KDMNameFormat name_format,
-		dcp::NameFormat::Map name_values,
+		std::list<KDMWithMetadataPtr> kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
 		std::string cpl_name,
-		boost::shared_ptr<Log> log
+		std::vector<std::string> extra_addresses
 		);
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	SendKDMEmailJob (
+		std::list<std::list<KDMWithMetadataPtr>> kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		std::string cpl_name,
+		std::vector<std::string> extra_addresses
+		);
+
+	~SendKDMEmailJob ();
+
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
 
 private:
-	KDMNameFormat _name_format;
-	dcp::NameFormat::Map _name_values;
+	dcp::NameFormat _container_name_format;
+	dcp::NameFormat _filename_format;
 	std::string _cpl_name;
-	std::list<CinemaKDMs> _cinema_kdms;
-	boost::shared_ptr<Log> _log;
+	std::list<std::list<KDMWithMetadataPtr>> _kdms;
+	std::vector<std::string> _extra_addresses;
 };