X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.h;h=2b010665cae79e08bb57b71a2035576996e9e9da;hp=e16716a6675cb60cb471f05b18325bda53fb96ed;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index e16716a66..2b010665c 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,48 @@
 
 */
 
+
 #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>
 
-class Screen;
-class CinemaKDMs;
+
+namespace dcpomatic {
+	class Screen;
+}
+
+
 class Log;
 
+
 class SendKDMEmailJob : public Job
 {
 public:
 	SendKDMEmailJob (
-		std::list<CinemaKDMs> cinema_kdms,
-		KDMNameFormat name_format,
-		NameFormat::Map name_values,
-		std::string cpl_name,
-		boost::shared_ptr<Log> log
+		std::list<KDMWithMetadataPtr> kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		std::string cpl_name
 		);
 
+	SendKDMEmailJob (
+		std::list<std::list<KDMWithMetadataPtr>> kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		std::string cpl_name
+		);
+
+	~SendKDMEmailJob ();
+
 	std::string name () const;
 	std::string json_name () const;
 	void run ();
 
 private:
-	KDMNameFormat _name_format;
-	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;
 };