Extract common code out into kdm_for_screen()

[dcpomatic.git] / src / wx / kdm_dialog.cc

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 59d961e6c9d1e226cf7790c0af252c72cb43bb48..d3bbf02c998e164ec4f317a00db7c80a04d9718c 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -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;
@@ -163,22 +162,11 @@ KDMDialog::make_clicked ()
                }
 
                BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) {
-                       if (i->recipient) {
-                               dcp::EncryptedKDM const kdm = film->make_kdm (
-                                               i->recipient.get(),
-                                               i->trusted_device_thumbprints(),
-                                               _cpl->cpl(),
-                                               dcp::LocalTime(_timing->from(),  i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-                                               dcp::LocalTime(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-                                               _output->formulation(),
-                                               !_output->forensic_mark_video(),
-                                               for_audio
-                                               );
-
-                               screen_kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
+                       KDMWithMetadataPtr p = kdm_for_screen (film, _cpl->cpl(), i, _timing->from(), _timing->until(), _output->formulation(), !_output->forensic_mark_video(), for_audio);
+                       if (p) {
+                               kdms.push_back (p);
                        }
                }
-
        } 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."));
@@ -191,7 +179,7 @@ KDMDialog::make_clicked ()
                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);
        }