X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=59d961e6c9d1e226cf7790c0af252c72cb43bb48;hb=08f96200aacf9f91ef3e3f5b80224a5b2437f279;hp=f59250750bc590734c13efc4e93b11cfb3d30ee4;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index f59250750..59d961e6c 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,10 +26,10 @@
 #include "kdm_cpl_panel.h"
 #include "confirm_kdm_email_dialog.h"
 #include "static_text.h"
+#include "dcpomatic_button.h"
 #include "lib/film.h"
 #include "lib/screen.h"
 #include "lib/screen_kdm.h"
-#include "lib/send_kdm_email_job.h"
 #include "lib/job_manager.h"
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
@@ -51,6 +51,7 @@ using std::make_pair;
 using std::runtime_error;
 using boost::shared_ptr;
 using boost::bind;
+using boost::optional;
 
 KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make KDMs"))
@@ -87,7 +88,15 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
 	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
-	_cpl = new KDMCPLPanel (this, film->cpls ());
+
+	vector<CPLSummary> cpls;
+	BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
+		if (i.encrypted) {
+			cpls.push_back (i);
+		}
+	}
+
+	_cpl = new KDMCPLPanel (this, cpls);
 	right->Add (_cpl, 0, wxEXPAND);
 
 	/* Sub-heading: Output */
@@ -97,7 +106,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	_output = new KDMOutputPanel (this, film->interop ());
 	right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
-	_make = new wxButton (this, wxID_ANY, _("Make KDMs"));
+	_make = new Button (this, _("Make KDMs"));
 	right->Add (_make, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
 	/* Make an overall sizer to get a nice border */
@@ -141,14 +150,42 @@ KDMDialog::make_clicked ()
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	list<ScreenKDM> screen_kdms;
+	list<shared_ptr<ScreenKDM> > screen_kdms;
 	try {
-
-		screen_kdms = film->make_kdms (
-			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(),
-			!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
-			);
-
+		/* Start off by enabling forensic marking for all */
+		optional<int> for_audio;
+		if (!_output->forensic_mark_audio()) {
+			/* No forensic marking for audio */
+			for_audio = 0;
+		} else if (_output->forensic_mark_audio_up_to()) {
+			/* Forensic mark up to this channel; disabled on channels greater than this */
+			for_audio = _output->forensic_mark_audio_up_to();
+		}
+
+		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)));
+			}
+		}
+
+	} 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;