projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[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 e16716a6675cb60cb471f05b18325bda53fb96ed..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 "job.h"
-#include "kdm_name_format.h"
#include <dcp/types.h>
#include <dcp/types.h>
+#include <dcp/name_format.h>
#include <boost/filesystem.hpp>
class Screen;
#include <boost/filesystem.hpp>
class Screen;
@@
-32,10
+32,10
@@
class SendKDMEmailJob : public Job
public:
SendKDMEmailJob (
std::list<CinemaKDMs> cinema_kdms,
public:
SendKDMEmailJob (
std::list<CinemaKDMs> cinema_kdms,
-
KDMNameFormat
name_format,
-
NameFormat::Map name_values
,
-
std::string cpl_name
,
- 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;
);
std::string name () const;
@@
-43,9
+43,9
@@
public:
void run ();
private:
void run ();
private:
- KDMNameFormat _name_format;
- NameFormat::Map _name_values;
+ dcp::NameFormat _container_name_format;
+ dcp::NameFormat _filename_format;
+ dcp::NameFormat::Map _name_values;
std::string _cpl_name;
std::list<CinemaKDMs> _cinema_kdms;
std::string _cpl_name;
std::list<CinemaKDMs> _cinema_kdms;
- boost::shared_ptr<Log> _log;
};
};