X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=38484b91e15500333184422541b45c77e763c396;hp=e4b20167e2fcd4176c16d09b82c5d84c7234020e;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=fbe2784c136fa1550815babfce89589f66b35a29

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index e4b20167e..38484b91e 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -30,20 +30,25 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
-/** @param log Log to write to, or 0 */
+/** @param cinema_kdms KDMs to email.
+ *  @param container_name_format Format to ues for folders / ZIP files.
+ *  @param filename_format Format to use for filenames.
+ *  @param name_values Values to substitute into \p container_name_format and \p filename_format.
+ *  @param cpl_name Name of the CPL that the KDMs are for.
+ */
 SendKDMEmailJob::SendKDMEmailJob (
 	list<CinemaKDMs> cinema_kdms,
-	KDMNameFormat name_format,
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
 	dcp::NameFormat::Map name_values,
-	string cpl_name,
-	shared_ptr<Log> log
+	string cpl_name
 	)
 	: Job (shared_ptr<Film>())
-	, _name_format (name_format)
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
 	, _name_values (name_values)
 	, _cpl_name (cpl_name)
 	, _cinema_kdms (cinema_kdms)
-	, _log (log)
 {
 
 }
@@ -69,7 +74,7 @@ void
 SendKDMEmailJob::run ()
 {
 	set_progress_unknown ();
-	CinemaKDMs::email (_cinema_kdms, _name_format, _name_values, _cpl_name, _log);
+	CinemaKDMs::email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }