X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=8682fe82f92a460aef24350e665875f981c8f2d4;hp=c31e6f64351bcdf247e491e6031398276ee31d4f;hb=40162baf4ac63ee28624eaeb04b21db913eb7cca;hpb=aedd7757b17e3bffbd67b11b48d4b0ce88d57c74

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index c31e6f643..8682fe82f 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.
 
@@ -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 */
@@ -141,14 +150,29 @@ KDMDialog::make_clicked ()
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	list<ScreenKDM> screen_kdms;
+	list<shared_ptr<ScreenKDM> > screen_kdms;
 	try {
-
+		/* 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();
+		}
 		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
+			!_output->forensic_mark_video(), for_audio
 			);
 
+	} 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;