projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment.
[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 67ddd0eef540d055a2eeeb10285b662c393758be..304b4a3287366f711c95886c674018f19474a5ad 100644
(file)
--- a/
src/lib/send_kdm_email_job.cc
+++ b/
src/lib/send_kdm_email_job.cc
@@
-19,18
+19,19
@@
*/
*/
-#include "send_kdm_email_job.h"
#include "compose.hpp"
#include "compose.hpp"
-#include "kdm_with_metadata.h"
#include "film.h"
#include "film.h"
+#include "kdm_with_metadata.h"
+#include "send_kdm_email_job.h"
#include <list>
#include "i18n.h"
#include <list>
#include "i18n.h"
-using std::string;
using std::list;
using std::shared_ptr;
using std::list;
using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::optional;
using boost::optional;
@@
-38,12
+39,14
@@
SendKDMEmailJob::SendKDMEmailJob (
list<KDMWithMetadataPtr> kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
list<KDMWithMetadataPtr> kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- string cpl_name
+ string cpl_name,
+ vector<string> extra_addresses
)
: Job (shared_ptr<Film>())
, _container_name_format (container_name_format)
, _filename_format (filename_format)
, _cpl_name (cpl_name)
)
: Job (shared_ptr<Film>())
, _container_name_format (container_name_format)
, _filename_format (filename_format)
, _cpl_name (cpl_name)
+ , _extra_addresses (extra_addresses)
{
for (auto i: kdms) {
list<KDMWithMetadataPtr> s;
{
for (auto i: kdms) {
list<KDMWithMetadataPtr> s;
@@
-54,7
+57,7
@@
SendKDMEmailJob::SendKDMEmailJob (
/** @param kdms KDMs to email.
/** @param kdms KDMs to email.
- * @param container_name_format Format to u
es
for folders / ZIP files.
+ * @param container_name_format Format to u
se
for folders / ZIP files.
* @param filename_format Format to use for filenames.
* @param name_values Values to substitute into \p container_name_format and \p filename_format.
* @param cpl_name Name of the CPL that the KDMs are for.
* @param filename_format Format to use for filenames.
* @param name_values Values to substitute into \p container_name_format and \p filename_format.
* @param cpl_name Name of the CPL that the KDMs are for.
@@
-63,13
+66,15
@@
SendKDMEmailJob::SendKDMEmailJob (
list<list<KDMWithMetadataPtr> > kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
list<list<KDMWithMetadataPtr> > kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- string cpl_name
+ string cpl_name,
+ vector<string> extra_addresses
)
: Job (shared_ptr<Film>())
, _container_name_format (container_name_format)
, _filename_format (filename_format)
, _cpl_name (cpl_name)
, _kdms (kdms)
)
: Job (shared_ptr<Film>())
, _container_name_format (container_name_format)
, _filename_format (filename_format)
, _cpl_name (cpl_name)
, _kdms (kdms)
+ , _extra_addresses (extra_addresses)
{
}
{
}
@@
-89,7
+94,7
@@
SendKDMEmailJob::name () const
return _("Email KDMs");
}
return _("Email KDMs");
}
- return String::compose (_("Email KDMs for %
2
"), *f);
+ return String::compose (_("Email KDMs for %
1
"), *f);
}
}
@@
-104,7
+109,7
@@
void
SendKDMEmailJob::run ()
{
set_progress_unknown ();
SendKDMEmailJob::run ()
{
set_progress_unknown ();
-
email (_kdms, _container_name_format, _filename_format, _cpl_name
);
+
send_emails (_kdms, _container_name_format, _filename_format, _cpl_name, _extra_addresses
);
set_progress (1);
set_state (FINISHED_OK);
}
set_progress (1);
set_state (FINISHED_OK);
}