X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=d3bbf02c998e164ec4f317a00db7c80a04d9718c;hp=f041c16c52febf299d9e500ba6471235732c70e6;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=4e62980064496060af5a8c6ecab26ddf218aa63a

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index f041c16c5..d3bbf02c9 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -31,7 +31,6 @@
 #include "lib/screen.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<KDMWithMetadataPtr> screen_kdms;
+	list<KDMWithMetadataPtr> kdms;
 	try {
 		/* Start off by enabling forensic marking for all */
 		optional<int> for_audio;
@@ -163,28 +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
-						);
-
-				dcp::NameFormat::Map name_values;
-				if (i->cinema) {
-					name_values['c'] = i->cinema->name;
-				}
-				name_values['s'] = i->name;
-
-				screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, 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."));
@@ -197,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);
 	}