Set 'i' earlier in name_values.
[dcpomatic.git] / src / wx / kdm_dialog.cc
index 5a31501cf27bb3e53a14ddb82e774ebe5db9d557..d74741871a63213fefbdd8419b506f7f7b9146e6 100644 (file)
@@ -29,9 +29,8 @@
 #include "dcpomatic_button.h"
 #include "lib/film.h"
 #include "lib/screen.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/job_manager.h"
-#include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/cinema.h"
 #include <libcxml/cxml.h>
@@ -150,7 +149,7 @@ KDMDialog::make_clicked ()
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
-       list<shared_ptr<ScreenKDM> > screen_kdms;
+       list<KDMWithMetadataPtr> kdms;
        try {
                /* Start off by enabling forensic marking for all */
                optional<int> for_audio;
@@ -161,17 +160,50 @@ KDMDialog::make_clicked ()
                        /* Forensic mark up to this channel; disabled on channels greater than this */
                        for_audio = _output->forensic_mark_audio_up_to();
                }
-               screen_kdms = film->make_kdms (
-                       _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(),
-                       !_output->forensic_mark_video(), for_audio
-                       );
 
+               BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) {
+                       if (i->recipient) {
+                               dcp::LocalTime const begin(_timing->from(),  i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
+                               dcp::LocalTime const end(_timing->until(), 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->cpl(),
+                                               begin,
+                                               end,
+                                               _output->formulation(),
+                                               !_output->forensic_mark_video(),
+                                               for_audio
+                                               );
+
+                               dcp::NameFormat::Map name_values;
+                               if (i->cinema) {
+                                       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(false, false);
+                               name_values['e'] = dcp::LocalTime(end).date() + " " + dcp::LocalTime(end).time_of_day(false, false);
+                               name_values['i'] = kdm.cpl_id();
+
+                               kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
+                       }
+               }
+
+       } catch (dcp::BadKDMDateError& e) {
+               if (e.starts_too_early()) {
+                       error_dialog (this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
+               } else {
+                       error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+               }
+               return;
        } catch (runtime_error& e) {
                error_dialog (this, std_to_wx(e.what()));
                return;
        }
 
-       pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1));
+       pair<shared_ptr<Job>, int> result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1));
        if (result.first) {
                JobManager::instance()->add (result.first);
        }