X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fkdm_with_metadata.cc;h=a486952f8e277c9c44bf2eea59676f6fee6d5f85;hb=10c9dbd18c11dc57629b5a0e0b8f33079f5d2d8f;hp=fbd2e4bd49e7d417849159c46653a67c978d2416;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index fbd2e4bd4..a486952f8 100644 --- 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 -#include #include "i18n.h" @@ -38,7 +36,7 @@ using std::cout; using std::list; using std::shared_ptr; using boost::optional; -using boost::function; +using std::function; int @@ -46,7 +44,7 @@ write_files ( list kdms, boost::filesystem::path directory, dcp::NameFormat name_format, - boost::function confirm_overwrite + std::function confirm_overwrite ) { int written = 0; @@ -197,7 +195,7 @@ write_zip_files ( * @param cpl_name Name of the CPL that the KDMs are for. */ void -email ( +send_emails ( list> kdms, dcp::NameFormat container_name_format, dcp::NameFormat filename_format, @@ -235,7 +233,7 @@ email ( string screens; for (auto j: i) { - auto screen_name = j->get('n'); + auto screen_name = j->get('s'); if (screen_name) { screens += *screen_name + ", "; }