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

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index e16716a66..0b64db7a8 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,11 +19,14 @@
 */
 
 #include "job.h"
-#include "kdm_name_format.h"
 #include <dcp/types.h>
+#include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
 
-class Screen;
+namespace dcpomatic {
+	class Screen;
+}
+
 class CinemaKDMs;
 class Log;
 
@@ -32,10 +35,10 @@ 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
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		dcp::NameFormat::Map name_values,
+		std::string cpl_name
 		);
 
 	std::string name () const;
@@ -43,9 +46,9 @@ public:
 	void run ();
 
 private:
-	KDMNameFormat _name_format;
-	NameFormat::Map _name_values;
+	dcp::NameFormat _container_name_format;
+	dcp::NameFormat _filename_format;
+	dcp::NameFormat::Map _name_values;
 	std::string _cpl_name;
 	std::list<CinemaKDMs> _cinema_kdms;
-	boost::shared_ptr<Log> _log;
 };