X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.h;h=fa409edaaed9041793cb7f7c3f9f742cb1dad04f;hb=581797d640af1572f884ddf4395924894b745b3a;hp=1bba69f9b42d549f68bcd25d33060b9efb3f8076;hpb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 1bba69f9b..fa409edaa 100644
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -1,51 +1,61 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "job.h"
+#include "kdm_with_metadata.h"
 #include <dcp/types.h>
+#include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
 
-class Screen;
-class CinemaKDMs;
+namespace dcpomatic {
+	class Screen;
+}
+
 class Log;
 
 class SendKDMEmailJob : public Job
 {
 public:
 	SendKDMEmailJob (
-		std::string film_name,
-		std::string cpl_name,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime to,
-		std::list<CinemaKDMs> cinema_kdms,
-		boost::shared_ptr<Log> log
+		std::list<KDMWithMetadataPtr> kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		std::string cpl_name
+		);
+
+	SendKDMEmailJob (
+		std::list<std::list<KDMWithMetadataPtr> > kdms,
+		dcp::NameFormat container_name_format,
+		dcp::NameFormat filename_format,
+		std::string cpl_name
 		);
 
+	~SendKDMEmailJob ();
+
 	std::string name () const;
 	std::string json_name () const;
 	void run ();
 
 private:
-	std::string _film_name;
+	dcp::NameFormat _container_name_format;
+	dcp::NameFormat _filename_format;
 	std::string _cpl_name;
-	boost::posix_time::ptime _from;
-	boost::posix_time::ptime _to;
-	std::list<CinemaKDMs> _cinema_kdms;
-	boost::shared_ptr<Log> _log;
+	std::list<std::list<KDMWithMetadataPtr> > _kdms;
 };