X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=1aad31cb534d7d1fd656bad295b55de3afc95110;hb=36ce958a516567d8481163692c028a88c6ce0df7;hp=166b22285a741f8cd5cdc491982042c78d3f8f8a;hpb=9d049dc062df1c134105ec6a042aa9f56ae9c067;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 166b22285..1aad31cb5 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -24,7 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
@@ -130,7 +130,7 @@ always_overwrite ()
 
 void
 write_files (
-	list<shared_ptr<ScreenKDM> > screen_kdms,
+	list<shared_ptr<KDMWithMetadata> > screen_kdms,
 	bool zip,
 	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
@@ -153,7 +153,7 @@ write_files (
 			cout << "Wrote " << N << " ZIP files to " << output << "\n";
 		}
 	} else {
-		int const N = ScreenKDM::write_files (
+		int const N = KDMWithMetadata::write_files (
 			screen_kdms, output, filename_format, values,
 			bind (&always_overwrite)
 			);
@@ -229,11 +229,26 @@ from_film (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<shared_ptr<ScreenKDM> > screen_kdms = film->make_kdms (
-			screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
-			);
+		list<shared_ptr<KDMWithMetadata> > kdms;
 
-		write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+			if (i->recipient) {
+				dcp::EncryptedKDM const kdm = film->make_kdm (
+						i->recipient.get(),
+						i->trusted_device_thumbprints(),
+						cpl,
+						dcp::LocalTime(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+						dcp::LocalTime(valid_to,   i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+						formulation,
+						disable_forensic_marking_picture,
+						disable_forensic_marking_audio
+						);
+
+				kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
+			}
+		}
+
+		write_files (kdms, zip, output, container_name_format, filename_format, values, verbose);
 	} catch (FileError& e) {
 		cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
 		exit (EXIT_FAILURE);
@@ -330,15 +345,15 @@ from_dkdm (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<shared_ptr<ScreenKDM> > screen_kdms;
+		list<shared_ptr<KDMWithMetadata> > screen_kdms;
 		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
 			if (!i->recipient) {
 				continue;
 			}
 
 			screen_kdms.push_back (
-				shared_ptr<ScreenKDM>(
-					new DCPScreenKDM(
+				shared_ptr<KDMWithMetadata>(
+					new DCPKDMWithMetadata(
 						i,
 						kdm_from_dkdm(
 							dkdm,