X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.h;h=452c76cee9060880c99ca6564cd1da564dd162ab;hb=2d5c6f23650ae3a912badc8b059c83d40c61a0fa;hp=17b2db89c9fae430cddb29fc21f833b6dd8948d5;hpb=f4964573a60155545e02cbbebc47199f7480cf14;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 17b2db89c..452c76cee 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-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,33 +19,35 @@
 */
 
 #include "job.h"
-#include "kdm_filename_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,
-		KDMFilenameFormat name_format,
-		dcp::NameFormat::Map name_values,
-		std::string cpl_name,
-		boost::shared_ptr<Log> log
+		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:
-	KDMFilenameFormat _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;
 };