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 c2916f69d02a14f2d0522fb280e0e5cfe3468d6e..0b64db7a8879c64bf4baf5392444e72b3ba4f204 100644 (file)
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,10 @@
 #include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
 
-class Screen;
+namespace dcpomatic {
+       class Screen;
+}
+
 class CinemaKDMs;
 class Log;
 
@@ -32,10 +35,10 @@ class SendKDMEmailJob : public Job
 public:
        SendKDMEmailJob (
                std::list<CinemaKDMs> cinema_kdms,
-               dcp::NameFormat name_format,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
                dcp::NameFormat::Map name_values,
-               std::string cpl_name,
-               boost::shared_ptr<Log> log
+               std::string cpl_name
                );
 
        std::string name () const;
@@ -43,9 +46,9 @@ public:
        void run ();
 
 private:
-       dcp::NameFormat _name_format;
+       dcp::NameFormat _container_name_format;
+       dcp::NameFormat _filename_format;
        dcp::NameFormat::Map _name_values;
        std::string _cpl_name;
        std::list<CinemaKDMs> _cinema_kdms;
-       boost::shared_ptr<Log> _log;
 };