Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / send_kdm_email_job.h

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 1bba69f9b42d549f68bcd25d33060b9efb3f8076..0b64db7a8879c64bf4baf5392444e72b3ba4f204 100644 (file)
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -1,27 +1,32 @@
 /*
-    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 <dcp/types.h>
+#include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
 
-class Screen;
+namespace dcpomatic {
+       class Screen;
+}
+
 class CinemaKDMs;
 class Log;
 
@@ -29,12 +34,11 @@ 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
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               dcp::NameFormat::Map name_values,
+               std::string cpl_name
                );
 
        std::string name () const;
@@ -42,10 +46,9 @@ public:
        void run ();
 
 private:
-       std::string _film_name;
+       dcp::NameFormat _container_name_format;
+       dcp::NameFormat _filename_format;
+       dcp::NameFormat::Map _name_values;
        std::string _cpl_name;
-       boost::posix_time::ptime _from;
-       boost::posix_time::ptime _to;
        std::list<CinemaKDMs> _cinema_kdms;
-       boost::shared_ptr<Log> _log;
 };