From 142f688c0ebb6938ef2d7f2b7e7c859d12af7e23 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 14 Feb 2018 23:27:27 +0000
Subject: Build fixes.

---
 src/tools/dcpomatic_kdm.cc     | 9 ++++++++-
 src/tools/dcpomatic_kdm_cli.cc | 2 ++
 src/wx/kdm_dialog.cc           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 866d09c70..5b296b300 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -328,7 +328,14 @@ private:
 				}
 
 				/* Encrypt */
-				screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
+				screen_kdms.push_back (
+					ScreenKDM (
+						i,
+						kdm.encrypt (
+							signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0
+							)
+						)
+					);
 			}
 
 			pair<shared_ptr<Job>, int> result = _output->make (
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index f632d808a..f1849adf6 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -498,6 +498,7 @@ int main (int argc, char* argv[])
 			screen_description = optarg;
 			break;
 		case 'C':
+		{
 			/* Make a new screen and add it to the current cinema */
 			shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<dcp::Certificate>()));
 			if (cinema) {
@@ -505,6 +506,7 @@ int main (int argc, char* argv[])
 			}
 			screens.push_back (screen);
 			break;
+		}
 		case 'T':
 			/* A trusted device ends up in the last screen we made */
 			if (!screens.empty ()) {
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 5679cf0cb..64987a121 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -140,7 +140,7 @@ KDMDialog::make_clicked ()
 	DCPOMATIC_ASSERT (film);
 
 	list<ScreenKDM> screen_kdms = film->make_kdms (
-		_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
+		_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(), true, 0
 		);
 
 	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());
-- 
cgit v1.2.3