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

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index f632d808a..4a6ea50a7 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -73,7 +73,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"
-		"\tdcpomatic_kdm -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n";
+		"\tdcpomatic2_kdm_cli -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n";
 }
 
 static void
@@ -273,7 +273,7 @@ dcp::EncryptedKDM
 kdm_from_dkdm (
 	dcp::DecryptedKDM dkdm,
 	dcp::Certificate target,
-	vector<dcp::Certificate> trusted_devices,
+	vector<string> trusted_devices,
 	dcp::LocalTime valid_from,
 	dcp::LocalTime valid_to,
 	dcp::Formulation formulation,
@@ -337,7 +337,7 @@ from_dkdm (
 					kdm_from_dkdm (
 						dkdm,
 						i->recipient.get(),
-						i->trusted_devices,
+						i->trusted_device_thumbprints(),
 						dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 						dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 						formulation,
@@ -498,17 +498,19 @@ 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>()));
+			shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<TrustedDevice>()));
 			if (cinema) {
 				cinema->add_screen (screen);
 			}
 			screens.push_back (screen);
 			break;
+		}
 		case 'T':
 			/* A trusted device ends up in the last screen we made */
 			if (!screens.empty ()) {
-				screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg)));
+				screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg))));
 			}
 			break;
 		case 'B':