X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=999bba17ee68292bdf1ce7fd71a37f9c45f97f46;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=65326efb3e52139cfda31536c63b5f0bf02c3102;hpb=c6871fe8617b3de03662b7630355059393bf8043;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 65326efb3..999bba17e 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -31,6 +31,7 @@
 #include "wx/file_dialog_wrapper.h"
 #include "wx/new_dkdm_folder_dialog.h"
 #include "wx/editable_list.h"
+#include "wx/static_text.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/screen.h"
@@ -129,20 +130,20 @@ public:
 		wxFont subheading_font (*wxNORMAL_FONT);
 		subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-		wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens"));
+		wxStaticText* h = new StaticText (overall_panel, _("Screens"));
 		h->SetFont (subheading_font);
 		left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 		_screens = new ScreensPanel (overall_panel);
 		left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 
 		/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-		h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing"));
+		h = new StaticText (overall_panel, S_("KDM|Timing"));
 		h->SetFont (subheading_font);
 		right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
 		_timing = new KDMTimingPanel (overall_panel);
 		right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
 
-		h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM"));
+		h = new StaticText (overall_panel, _("DKDM"));
 		h->SetFont (subheading_font);
 		right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 		wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
@@ -162,7 +163,7 @@ public:
 
 		add_dkdm_view (Config::instance()->dkdms());
 
-		h = new wxStaticText (overall_panel, wxID_ANY, _("Output"));
+		h = new StaticText (overall_panel, _("Output"));
 		h->SetFont (subheading_font);
 		right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 		/* XXX: hard-coded non-interop here */
@@ -332,14 +333,15 @@ private:
 					ScreenKDM (
 						i,
 						kdm.encrypt (
-							signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0
+							signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
+							!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
 							)
 						)
 					);
 			}
 
 			pair<shared_ptr<Job>, int> result = _output->make (
-				screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr<Log> ()
+				screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
 				);
 
 			if (result.first) {