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=82fb55d802a8566b494b79de9466dedff552e3d9;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=b93599eb990cdad18c3de47d62575031ed688cea

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 82fb55d80..38484b91e 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -30,22 +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 (
-	string film_name,
-	string cpl_name,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
 	list<CinemaKDMs> cinema_kdms,
-	shared_ptr<Log> log
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
+	dcp::NameFormat::Map name_values,
+	string cpl_name
 	)
 	: Job (shared_ptr<Film>())
-	, _film_name (film_name)
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
+	, _name_values (name_values)
 	, _cpl_name (cpl_name)
-	, _from (from)
-	, _to (to)
 	, _cinema_kdms (cinema_kdms)
-	, _log (log)
 {
 
 }
@@ -53,11 +56,12 @@ SendKDMEmailJob::SendKDMEmailJob (
 string
 SendKDMEmailJob::name () const
 {
-	if (_film_name.empty ()) {
+	dcp::NameFormat::Map::const_iterator i = _name_values.find ('f');
+	if (i == _name_values.end() || i->second.empty ()) {
 		return _("Email KDMs");
 	}
 
-	return String::compose (_("Email KDMs for %1"), _film_name);
+	return String::compose (_("Email KDMs for %1"), i->second);
 }
 
 string
@@ -70,7 +74,7 @@ void
 SendKDMEmailJob::run ()
 {
 	set_progress_unknown ();
-	CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms,	dcp::LocalTime (_from), dcp::LocalTime (_to), _log);
+	CinemaKDMs::email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }