Make terminate_threads() less likely to leave _threads containing invalid pointers.

[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 bfb4d6c522837ef07f4ee34a7522ee95e60bd345..b4e007e3ba51cac9d576c115b90e4bac20245070 100644 (file)
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -19,8 +19,8 @@
 */
 
 #include "job.h"
-#include "kdm_name_format.h"
 #include <dcp/types.h>
+#include <dcp/name_format.h>
 #include <boost/filesystem.hpp>
 
 class Screen;
@@ -32,10 +32,10 @@ class SendKDMEmailJob : public Job
 public:
        SendKDMEmailJob (
                std::list<CinemaKDMs> cinema_kdms,
-               KDMNameFormat 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 +43,9 @@ public:
        void run ();
 
 private:
-       KDMNameFormat _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;
 };