X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=da856d3589af6246df58ee6f96c1eb70517c3548;hp=7920f7e5756b9994c7147fd5c45bccc1fb87cd9d;hb=0a1d944d74308ccb940194bcb627652c72128650;hpb=5579acd7ff7e1460f0b5bb54a4deedbd356153cd

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 7920f7e57..da856d358 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -334,6 +334,7 @@ private:
 					name_values['f'] = title;
 					name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
 					name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+					name_values['i'] = kdm.id();
 
 					/* Encrypt */
 					kdms.push_back (
@@ -381,24 +382,23 @@ private:
 						kdm.add_key (j);
 					}
 
+					dcp::EncryptedKDM const encrypted = kdm.encrypt(
+							signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
+							!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
+							);
+
 					dcp::NameFormat::Map name_values;
 					name_values['c'] = i->cinema->name;
 					name_values['s'] = i->name;
 					name_values['f'] = title;
 					name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
 					name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+					name_values['i'] = encrypted.cpl_id ();
 
 					/* Encrypt */
 					kdms.push_back (
 						KDMWithMetadataPtr(
-							new DCPKDMWithMetadata(
-								name_values,
-								i->cinema,
-								kdm.encrypt(
-									signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
-									!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
-									)
-								)
+							new DCPKDMWithMetadata(name_values, i->cinema, encrypted)
 							)
 						);
 				}