X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=21f9ec7340d198ac70dd584106cadbd4ebfc1bce;hb=b7e546d9685c0a3304faa48e95516915d811ec5c;hp=4a6ea50a7abc88dd30bdcb60b841b714ad68b741;hpb=a95d24580dc72a9263e8f807d86da279b22fbfb3;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 4a6ea50a7..21f9ec734 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -42,6 +42,7 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::vector;
+using std::runtime_error;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
@@ -59,8 +60,8 @@ help ()
 		"  -t, --valid-to                           valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n"
 		"  -d, --valid-duration                     valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
 		"  -F, --formulation                        modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
-		"  -a, --disable-forensic-marking-picture   disable forensic of pictures essences\n"
-		"  -a, --disable-forensic-marking-audio     disable forensic of audio essences (optionally above a given channel, e.g 12)\n"
+		"  -a, --disable-forensic-marking-picture   disable forensic marking of pictures essences\n"
+		"  -a, --disable-forensic-marking-audio     disable forensic marking of audio essences (optionally above a given channel, e.g 12)\n"
 		"  -z, --zip                                ZIP each cinema's KDMs into its own file\n"
 		"  -v, --verbose                            be verbose\n"
 		"  -c, --cinema                             specify a cinema, either by name or email address\n"
@@ -73,7 +74,7 @@ help ()
 		"For example:\n\n"
 		"Create KDMs for my_great_movie to play in all of Fred's Cinema's screens for the next two weeks and zip them up.\n"
 		"(Fred's Cinema must have been set up in DCP-o-matic's KDM window)\n\n"
-		"\tdcpomatic2_kdm_cli -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n";
+		"\t" << program_name << " -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n";
 }
 
 static void
@@ -238,6 +239,9 @@ from_film (
 	} catch (KDMError& e) {
 		cerr << program_name << ": " << e.what() << "\n";
 		exit (EXIT_FAILURE);
+	} catch (runtime_error& e) {
+		cerr << program_name << ": " << e.what() << "\n";
+		exit (EXIT_FAILURE);
 	}
 }
 
@@ -500,7 +504,8 @@ int main (int argc, char* argv[])
 		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<TrustedDevice>()));
+			dcp::CertificateChain chain (dcp::file_to_string(optarg));
+			shared_ptr<Screen> screen (new Screen (screen_description, chain.leaf(), vector<TrustedDevice>()));
 			if (cinema) {
 				cinema->add_screen (screen);
 			}