X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=1b476fa63e7312a1ea67710a45e2fc0a6c88b384;hb=0877bf6d06de8e6f768534ec40c26bf629618a20;hp=890115747a3c379b6e64cfcb2e4cf28f80807cfd;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 890115747..1b476fa63 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -31,28 +31,33 @@ using std::list;
 using boost::shared_ptr;
 
 /** @param cinema_kdms KDMs to email.
- *  @param name_format Format to use for filenames.
- *  @param name_values Values to substitute into the filenames.
+ *  @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.
- *  @param log Log to write to, or 0.
  */
 SendKDMEmailJob::SendKDMEmailJob (
 	list<CinemaKDMs> cinema_kdms,
-	dcp::NameFormat 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)
 {
 
 }
 
+SendKDMEmailJob::~SendKDMEmailJob ()
+{
+	stop_thread ();
+}
+
 string
 SendKDMEmailJob::name () const
 {
@@ -74,7 +79,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);
 }