X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=3dc3f21b017618ff8b448c47049f6fe7c151a193;hb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;hp=0551704417c0d85e59c062ebaee5b1ce0f21b6fd;hpb=3cf01b5a9a8312981af2fb432f6c717b1a17c137;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 055170441..3dc3f21b0 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -194,8 +194,8 @@ from_film (
 	boost::posix_time::ptime valid_from,
 	boost::posix_time::ptime valid_to,
 	dcp::Formulation formulation,
-	int disable_forensic_marking_picture,
-	int disable_forensic_marking_audio,
+	bool disable_forensic_marking_picture,
+	optional<int> disable_forensic_marking_audio,
 	bool zip
 	)
 {
@@ -273,12 +273,12 @@ 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,
-	int disable_forensic_marking_picture,
-	int disable_forensic_marking_audio
+	bool disable_forensic_marking_picture,
+	optional<int> disable_forensic_marking_audio
 	)
 {
 	/* Signer for new KDM */
@@ -314,8 +314,8 @@ from_dkdm (
 	boost::posix_time::ptime valid_from,
 	boost::posix_time::ptime valid_to,
 	dcp::Formulation formulation,
-	int disable_forensic_marking_picture,
-	int disable_forensic_marking_audio,
+	bool disable_forensic_marking_picture,
+	optional<int> disable_forensic_marking_audio,
 	bool zip
 	)
 {
@@ -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,
@@ -390,7 +390,6 @@ int main (int argc, char* argv[])
 	shared_ptr<Cinema> cinema;
 	string screen_description = "";
 	list<shared_ptr<Screen> > screens;
-	optional<dcp::Certificate> certificate;
 	optional<dcp::EncryptedKDM> dkdm;
 	optional<boost::posix_time::ptime> valid_from;
 	optional<boost::posix_time::ptime> valid_to;
@@ -400,8 +399,8 @@ int main (int argc, char* argv[])
 	optional<string> duration_string;
 	bool verbose = false;
 	dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
-	int disable_forensic_marking_picture = 0;
-	int disable_forensic_marking_audio = 0;
+	bool disable_forensic_marking_picture = false;
+	optional<int> disable_forensic_marking_audio;
 
 	program_name = argv[0];
 
@@ -471,13 +470,13 @@ int main (int argc, char* argv[])
 			}
 			break;
 		case 'p':
-			disable_forensic_marking_picture = -1;
+			disable_forensic_marking_picture = true;
 			break;
 		case 'a':
-			disable_forensic_marking_audio = -1;
-			if (optarg == NULL && argv[optind] != NULL && argv[optind][0] != '-') {
+			disable_forensic_marking_audio = 0;
+			if (optarg == 0 && argv[optind] != 0 && argv[optind][0] != '-') {
 				disable_forensic_marking_audio = atoi (argv[optind++]);
-			} else if (optarg != NULL) {
+			} else if (optarg) {
 				disable_forensic_marking_audio = atoi (optarg);
 			}
 			break;
@@ -488,17 +487,20 @@ int main (int argc, char* argv[])
 			verbose = true;
 			break;
 		case 'c':
+			/* This could be a cinema to search for in the configured list or the name of a cinema being
+			   built up on-the-fly in the option.  Cater for both possilibities here by storing the name
+			   (for lookup) and by creating a Cinema which the next Screen will be added to.
+			*/
 			cinema_name = optarg;
-			cinema = shared_ptr<Cinema> (new Cinema (cinema_name, list<string>(), "", 0, 0));
+			cinema = shared_ptr<Cinema> (new Cinema (optarg, list<string>(), "", 0, 0));
 			break;
 		case 'S':
 			screen_description = optarg;
 			break;
 		case 'C':
 		{
-			certificate = dcp::Certificate (dcp::file_to_string (optarg));
-			vector<dcp::Certificate> trusted_devices;
-			shared_ptr<Screen> screen (new Screen (screen_description, certificate, trusted_devices));
+			/* 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>()));
 			if (cinema) {
 				cinema->add_screen (screen);
 			}
@@ -506,7 +508,10 @@ int main (int argc, char* argv[])
 			break;
 		}
 		case 'T':
-			screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg)));
+			/* A trusted device ends up in the last screen we made */
+			if (!screens.empty ()) {
+				screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg))));
+			}
 			break;
 		case 'B':
 			list_cinemas = true;