projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do all writes then do all verification and report progress
[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..a7196fe15ca679e1c20d1c2e04a20556987e9fc6 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.
This file is part of DCP-o-matic.
@@
-19,11
+19,14
@@
*/
#include "job.h"
*/
#include "job.h"
-#include "kdm_name_format.h"
#include <dcp/types.h>
#include <dcp/types.h>
+#include <dcp/name_format.h>
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-class Screen;
+namespace dcpomatic {
+ class Screen;
+}
+
class CinemaKDMs;
class Log;
class CinemaKDMs;
class Log;
@@
-32,20
+35,21
@@
class SendKDMEmailJob : public Job
public:
SendKDMEmailJob (
std::list<CinemaKDMs> cinema_kdms,
public:
SendKDMEmailJob (
std::list<CinemaKDMs> cinema_kdms,
- KDMNameFormat name_format,
+ dcp::NameFormat container_name_format,
+ dcp::NameFormat filename_format,
dcp::NameFormat::Map name_values,
dcp::NameFormat::Map name_values,
- std::string cpl_name,
- boost::shared_ptr<Log> log
+ std::string cpl_name
);
);
+ ~SendKDMEmailJob ();
std::string name () const;
std::string json_name () const;
void run ();
private:
std::string name () const;
std::string json_name () const;
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;
dcp::NameFormat::Map _name_values;
std::string _cpl_name;
std::list<CinemaKDMs> _cinema_kdms;
- boost::shared_ptr<Log> _log;
};
};