projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build for older macOS.
[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 55a1718114a2566c29ec6ad5680c0be174dfcb59..67ddd0eef540d055a2eeeb10285b662c393758be 100644
(file)
--- a/
src/lib/send_kdm_email_job.cc
+++ b/
src/lib/send_kdm_email_job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-202
1
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+
#include "send_kdm_email_job.h"
#include "compose.hpp"
#include "kdm_with_metadata.h"
#include "send_kdm_email_job.h"
#include "compose.hpp"
#include "kdm_with_metadata.h"
@@
-26,11
+27,13
@@
#include "i18n.h"
#include "i18n.h"
+
using std::string;
using std::list;
using std::string;
using std::list;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
+
SendKDMEmailJob::SendKDMEmailJob (
list<KDMWithMetadataPtr> kdms,
dcp::NameFormat container_name_format,
SendKDMEmailJob::SendKDMEmailJob (
list<KDMWithMetadataPtr> kdms,
dcp::NameFormat container_name_format,
@@
-42,13
+45,14
@@
SendKDMEmailJob::SendKDMEmailJob (
, _filename_format (filename_format)
, _cpl_name (cpl_name)
{
, _filename_format (filename_format)
, _cpl_name (cpl_name)
{
-
BOOST_FOREACH (KDMWithMetadataPtr i,
kdms) {
+
for (auto i:
kdms) {
list<KDMWithMetadataPtr> s;
s.push_back (i);
_kdms.push_back (s);
}
}
list<KDMWithMetadataPtr> s;
s.push_back (i);
_kdms.push_back (s);
}
}
+
/** @param kdms KDMs to email.
* @param container_name_format Format to ues for folders / ZIP files.
* @param filename_format Format to use for filenames.
/** @param kdms KDMs to email.
* @param container_name_format Format to ues for folders / ZIP files.
* @param filename_format Format to use for filenames.
@@
-70,15
+74,17
@@
SendKDMEmailJob::SendKDMEmailJob (
}
}
+
SendKDMEmailJob::~SendKDMEmailJob ()
{
stop_thread ();
}
SendKDMEmailJob::~SendKDMEmailJob ()
{
stop_thread ();
}
+
string
SendKDMEmailJob::name () const
{
string
SendKDMEmailJob::name () const
{
-
optional<string>
f = _kdms.front().front()->get('f');
+
auto
f = _kdms.front().front()->get('f');
if (!f || f->empty()) {
return _("Email KDMs");
}
if (!f || f->empty()) {
return _("Email KDMs");
}
@@
-86,12
+92,14
@@
SendKDMEmailJob::name () const
return String::compose (_("Email KDMs for %2"), *f);
}
return String::compose (_("Email KDMs for %2"), *f);
}
+
string
SendKDMEmailJob::json_name () const
{
return N_("send_kdm_email");
}
string
SendKDMEmailJob::json_name () const
{
return N_("send_kdm_email");
}
+
void
SendKDMEmailJob::run ()
{
void
SendKDMEmailJob::run ()
{