BOOST_FOREACH.

[dcpomatic.git] / src / tools / dcpomatic_kdm_cli.cc

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index a85624c82cc64fab1dd83d5cfeb907e686df6231..d0ee0cad925955d69f474e7dfd4debdbbb64ffcb 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -42,12 +42,16 @@ using std::cerr;
 using std::list;
 using std::vector;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 static void
 help ()
 {
@@ -134,7 +138,6 @@ write_files (
        boost::filesystem::path output,
        dcp::NameFormat container_name_format,
        dcp::NameFormat filename_format,
-       dcp::NameFormat::Map values,
        bool verbose
        )
 {
@@ -144,7 +147,6 @@ write_files (
                        output,
                        container_name_format,
                        filename_format,
-                       values,
                        bind (&always_overwrite)
                        );
 
@@ -153,7 +155,7 @@ write_files (
                }
        } else {
                int const N = write_files (
-                       kdms, output, filename_format, values,
+                       kdms, output, filename_format,
                        bind (&always_overwrite)
                        );
 
@@ -222,40 +224,15 @@ from_film (
 
        boost::filesystem::path cpl = cpls.front().cpl_file;
 
-       dcp::NameFormat::Map values;
-
        try {
                list<KDMWithMetadataPtr> kdms;
-
-               BOOST_FOREACH (shared_ptr<Screen> i, screens) {
-                       if (i->recipient) {
-
-                               dcp::LocalTime const begin(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
-                               dcp::LocalTime const end(valid_to,   i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
-
-                               dcp::EncryptedKDM const kdm = film->make_kdm (
-                                               i->recipient.get(),
-                                               i->trusted_device_thumbprints(),
-                                               cpl,
-                                               begin,
-                                               end,
-                                               formulation,
-                                               disable_forensic_marking_picture,
-                                               disable_forensic_marking_audio
-                                               );
-
-                               dcp::NameFormat::Map name_values;
-                               name_values['c'] = i->cinema->name;
-                               name_values['s'] = i->name;
-                               name_values['f'] = film->name();
-                               name_values['b'] = dcp::LocalTime(begin).date() + " " + dcp::LocalTime(begin).time_of_day(true, false);
-                               name_values['e'] = dcp::LocalTime(end).date() + " " + dcp::LocalTime(end).time_of_day(true, false);
-
-                               kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
+               for (auto i: screens) {
+                       KDMWithMetadataPtr p = kdm_for_screen (film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+                       if (p) {
+                               kdms.push_back (p);
                        }
                }
-
-               write_files (kdms, zip, output, container_name_format, filename_format, values, verbose);
+               write_files (kdms, zip, output, container_name_format, filename_format, verbose);
        } catch (FileError& e) {
                cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
                exit (EXIT_FAILURE);
@@ -271,7 +248,7 @@ from_film (
 optional<dcp::EncryptedKDM>
 sub_find_dkdm (shared_ptr<DKDMGroup> group, string cpl_id)
 {
-       BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+       for (auto i: group->children()) {
                shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
                if (g) {
                        optional<dcp::EncryptedKDM> dkdm = sub_find_dkdm (g, cpl_id);
@@ -323,7 +300,7 @@ kdm_from_dkdm (
                dcp::LocalTime().as_string()
                );
 
-       BOOST_FOREACH (dcp::DecryptedKDMKey const & j, dkdm.keys()) {
+       for (auto const& j: dkdm.keys()) {
                kdm.add_key(j);
        }
 
@@ -350,7 +327,7 @@ from_dkdm (
 
        try {
                list<KDMWithMetadataPtr> kdms;
-               BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+               for (auto i: screens) {
                        if (!i->recipient) {
                                continue;
                        }
@@ -358,19 +335,7 @@ from_dkdm (
                        dcp::LocalTime begin(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
                        dcp::LocalTime end(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
 
-                       dcp::NameFormat::Map name_values;
-                       name_values['c'] = i->cinema->name;
-                       name_values['s'] = i->name;
-                       name_values['f'] = dkdm.annotation_text().get_value_or("");
-                       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-                       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
-
-                       kdms.push_back (
-                               KDMWithMetadataPtr(
-                                       new DCPKDMWithMetadata(
-                                               name_values,
-                                               i->cinema,
-                                               kdm_from_dkdm(
+                       dcp::EncryptedKDM const kdm = kdm_from_dkdm(
                                                        dkdm,
                                                        i->recipient.get(),
                                                        i->trusted_device_thumbprints(),
@@ -379,12 +344,19 @@ from_dkdm (
                                                        formulation,
                                                        disable_forensic_marking_picture,
                                                        disable_forensic_marking_audio
-                                                       )
-                                               )
-                                       )
-                               );
+                                                       );
+
+                       dcp::NameFormat::Map name_values;
+                       name_values['c'] = i->cinema->name;
+                       name_values['s'] = i->name;
+                       name_values['f'] = dkdm.annotation_text().get_value_or("");
+                       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+                       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+                       name_values['i'] = kdm.cpl_id();
+
+                       kdms.push_back (KDMWithMetadataPtr(new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, kdm)));
                }
-               write_files (kdms, zip, output, container_name_format, filename_format, values, verbose);
+               write_files (kdms, zip, output, container_name_format, filename_format, verbose);
        } catch (FileError& e) {
                cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
                exit (EXIT_FAILURE);
@@ -403,7 +375,7 @@ dump_dkdm_group (shared_ptr<DKDMGroup> group, int indent)
                }
                cout << group->name() << "\n";
        }
-       BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+       for (auto i: group->children()) {
                shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
                if (g) {
                        dump_dkdm_group (g, indent + 2);
@@ -561,8 +533,8 @@ int main (int argc, char* argv[])
        }
 
        if (list_cinemas) {
-               list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
-               for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+               list<std::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
+               for (list<std::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
                        cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
                }
                exit (EXIT_SUCCESS);