X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=1b476fa63e7312a1ea67710a45e2fc0a6c88b384;hb=2671c61a532790ad06c03775b103682233426570;hp=3bf1887f49df2bdf12bf9bade02a2026a03fa7f8;hpb=fe9d2a290682021cd12a00bf21fa4db3012e2049;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 3bf1887f4..1b476fa63 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -30,28 +30,38 @@ 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)
 {
 
 }
 
+SendKDMEmailJob::~SendKDMEmailJob ()
+{
+	stop_thread ();
+}
+
 string
 SendKDMEmailJob::name () const
 {
-	dcp::NameFormat::Map::const_iterator i = _name_values.find ("film_name");
+	dcp::NameFormat::Map::const_iterator i = _name_values.find ('f');
 	if (i == _name_values.end() || i->second.empty ()) {
 		return _("Email KDMs");
 	}
@@ -69,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);
 }