X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=2ad07cce7a38bae73c62f2b1824def725e9ada34;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=3a2068d2bb4c45b848ce864f58cfdd1a673d54ff;hpb=beaf935b208c4c609645e0d6d6b7ff0e3865d590;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 3a2068d2b..2ad07cce7 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 
 #include <getopt.h>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
 #include "lib/kdm.h"
@@ -30,6 +30,7 @@ using std::stringstream;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 
 static string program_name;
@@ -40,9 +41,10 @@ help ()
 	cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n"
 		"  -h, --help             show this help\n"
 		"  -o, --output           output file or directory\n"
-		"  -f, --valid-from       valid from time (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
-		"  -t, --valid-to         valid to time (e.g. \"2014-09-28 01:41:51\")\n"
+		"  -f, --valid-from       valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
+		"  -t, --valid-to         valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n"
 		"  -d, --valid-duration   valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
+		"      --formulation      modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\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"
@@ -109,11 +111,12 @@ int main (int argc, char* argv[])
 	bool cinemas = false;
 	string duration_string;
 	bool verbose = false;
+	dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
 
 	program_name = argv[0];
 	
 	int option_index = 0;
-	while (1) {
+	while (true) {
 		static struct option long_options[] = {
 			{ "help", no_argument, 0, 'h'},
 			{ "output", required_argument, 0, 'o'},
@@ -125,10 +128,11 @@ int main (int argc, char* argv[])
 			{ "zip", no_argument, 0, 'z' },
 			{ "duration", required_argument, 0, 'd' },
 			{ "verbose", no_argument, 0, 'v' },
+			{ "formulation", required_argument, 0, 'C' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "ho:f:t:c:A:Bzd:v", long_options, &option_index);
+		int c = getopt_long (argc, argv, "ho:f:t:c:A:Bzd:vC:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -165,6 +169,16 @@ int main (int argc, char* argv[])
 		case 'v':
 			verbose = true;
 			break;
+		case 'C':
+			if (string (optarg) == "modified-transitional-1") {
+				formulation = dcp::MODIFIED_TRANSITIONAL_1;
+			} else if (string (optarg) == "dci-any") {
+				formulation = dcp::DCI_ANY;
+			} else if (string (optarg) == "dci-specific") {
+				formulation = dcp::DCI_SPECIFIC;
+			} else {
+				error ("unrecognised KDM formulation " + formulation);
+			}
 		}
 	}
 
@@ -219,14 +233,14 @@ int main (int argc, char* argv[])
 	}
 
 	/* XXX: allow specification of this */
-	list<boost::filesystem::path> dcps = film->dcps ();
-	if (dcps.empty ()) {
-		error ("no DCPs found in film");
-	} else if (dcps.size() > 1) {
-		error ("more than one DCP found in film");
+	vector<CPLSummary> cpls = film->cpls ();
+	if (cpls.empty ()) {
+		error ("no CPLs found in film");
+	} else if (cpls.size() > 1) {
+		error ("more than one CPL found in film");
 	}
 
-	boost::filesystem::path dcp = dcps.front ();
+	boost::filesystem::path cpl = cpls.front().cpl_file;
 
 	if (cinema_name.empty ()) {
 
@@ -234,8 +248,8 @@ int main (int argc, char* argv[])
 			error ("you must specify --output");
 		}
 		
-		shared_ptr<libdcp::Certificate> certificate (new libdcp::Certificate (boost::filesystem::path (certificate_file)));
-		libdcp::KDM kdm = film->make_kdm (certificate, dcp, valid_from.get(), valid_to.get());
+		shared_ptr<dcp::Certificate> certificate (new dcp::Certificate (boost::filesystem::path (certificate_file)));
+		dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
 		kdm.as_xml (output);
 		if (verbose) {
 			cout << "Generated KDM " << output << " for certificate.\n";
@@ -259,12 +273,18 @@ int main (int argc, char* argv[])
 
 		try {
 			if (zip) {
-				write_kdm_zip_files (film, (*i)->screens(), dcp, valid_from.get(), valid_to.get(), output);
+				write_kdm_zip_files (
+					film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+					);
+				
 				if (verbose) {
 					cout << "Wrote ZIP files to " << output << "\n";
 				}
 			} else {
-				write_kdm_files (film, (*i)->screens(), dcp, valid_from.get(), valid_to.get(), output);
+				write_kdm_files (
+					film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+					);
+				
 				if (verbose) {
 					cout << "Wrote KDM files to " << output << "\n";
 				}