projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with the macOS 10.8 version of wxWidgets.
[dcpomatic.git]
/
src
/
lib
/
kdm_with_metadata.cc
diff --git
a/src/lib/kdm_with_metadata.cc
b/src/lib/kdm_with_metadata.cc
index fbd2e4bd49e7d417849159c46653a67c978d2416..a486952f8e277c9c44bf2eea59676f6fee6d5f85 100644
(file)
--- a/
src/lib/kdm_with_metadata.cc
+++ b/
src/lib/kdm_with_metadata.cc
@@
-27,8
+27,6
@@
#include "config.h"
#include "dcpomatic_log.h"
#include "emailer.h"
#include "config.h"
#include "dcpomatic_log.h"
#include "emailer.h"
-#include <boost/function.hpp>
-#include <boost/function.hpp>
#include "i18n.h"
#include "i18n.h"
@@
-38,7
+36,7
@@
using std::cout;
using std::list;
using std::shared_ptr;
using boost::optional;
using std::list;
using std::shared_ptr;
using boost::optional;
-using
boost
::function;
+using
std
::function;
int
int
@@
-46,7
+44,7
@@
write_files (
list<KDMWithMetadataPtr> kdms,
boost::filesystem::path directory,
dcp::NameFormat name_format,
list<KDMWithMetadataPtr> kdms,
boost::filesystem::path directory,
dcp::NameFormat name_format,
-
boost
::function<bool (boost::filesystem::path)> confirm_overwrite
+
std
::function<bool (boost::filesystem::path)> confirm_overwrite
)
{
int written = 0;
)
{
int written = 0;
@@
-197,7
+195,7
@@
write_zip_files (
* @param cpl_name Name of the CPL that the KDMs are for.
*/
void
* @param cpl_name Name of the CPL that the KDMs are for.
*/
void
-
email
(
+
send_emails
(
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,
@@
-235,7
+233,7
@@
email (
string screens;
for (auto j: i) {
string screens;
for (auto j: i) {
- auto screen_name = j->get('
n
');
+ auto screen_name = j->get('
s
');
if (screen_name) {
screens += *screen_name + ", ";
}
if (screen_name) {
screens += *screen_name + ", ";
}