projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
send_kdm_email_job.cc
diff --git
a/src/lib/send_kdm_email_job.cc
b/src/lib/send_kdm_email_job.cc
index 8af0b556a13e7f1a5ceffcc066e9c02d0038c04d..541307f5acc8ace90d682b5b396046ddcdcbab2e 100644
(file)
--- a/
src/lib/send_kdm_email_job.cc
+++ b/
src/lib/send_kdm_email_job.cc
@@
-33,13
+33,15
@@
SendKDMEmailJob::SendKDMEmailJob (
list<shared_ptr<Screen> > screens,
boost::filesystem::path dcp,
boost::posix_time::ptime from,
list<shared_ptr<Screen> > screens,
boost::filesystem::path dcp,
boost::posix_time::ptime from,
- boost::posix_time::ptime to
+ boost::posix_time::ptime to,
+ dcp::Formulation formulation
)
: Job (f)
, _screens (screens)
, _dcp (dcp)
, _from (from)
, _to (to)
)
: Job (f)
, _screens (screens)
, _dcp (dcp)
, _from (from)
, _to (to)
+ , _formulation (formulation)
{
}
{
}
@@
-50,19
+52,13
@@
SendKDMEmailJob::name () const
return String::compose (_("Email KDMs for %1"), _film->name());
}
return String::compose (_("Email KDMs for %1"), _film->name());
}
-string
-SendKDMEmailJob::json_name () const
-{
- return N_("send_kdm_email");
-}
-
void
SendKDMEmailJob::run ()
{
try {
set_progress_unknown ();
void
SendKDMEmailJob::run ()
{
try {
set_progress_unknown ();
- email_kdms (_film, _screens, _dcp, _from, _to);
+ email_kdms (_film, _screens, _dcp, _from, _to
, _formulation
);
set_progress (1);
set_state (FINISHED_OK);
set_progress (1);
set_state (FINISHED_OK);