Modify KDM generation to work with CPLs rather than DCPs, and allow

user to specify a particular CPL to use.  Tidy up the KDM dialog
a bit.

1 files changed, 11 insertions, 10 deletions

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 3a2068d2b..041f6c7ef 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
@@ -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;
@@ -219,14 +220,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 ()) {
 
@@ -235,7 +236,7 @@ int main (int argc, char* argv[])
 		}
 		
 		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());
+		libdcp::KDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get());
 		kdm.as_xml (output);
 		if (verbose) {
 			cout << "Generated KDM " << output << " for certificate.\n";
@@ -259,12 +260,12 @@ 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, valid_from.get(), valid_to.get(), 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, valid_from.get(), valid_to.get(), output);
 				if (verbose) {
 					cout << "Wrote KDM files to " << output << "\n";
 				}