X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=2c274de423ba0048ce759c5f08c1bcba500f5c19;hb=22917c031a262ce6e90252a65d6f70a340fafbed;hp=6257d60af3f636e2a25eaf3464eebafa993c5ee3;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 6257d60af..2c274de42 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -17,14 +17,19 @@
 
 */
 
+/** @file  src/tools/dcpomatic_kdm.cc
+ *  @brief Command-line program to generate KDMs.
+ */
+
 #include <getopt.h>
-#include <dcp/certificates.h>
+#include <dcp/certificate.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
 #include "lib/kdm.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
 #include "lib/safe_stringstream.h"
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -33,8 +38,6 @@ using std::list;
 using std::vector;
 using boost::shared_ptr;
 
-static string program_name;
-
 static void
 help ()
 {
@@ -114,7 +117,7 @@ int main (int argc, char* argv[])
 	dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
 
 	program_name = argv[0];
-	
+
 	int option_index = 0;
 	while (true) {
 		static struct option long_options[] = {
@@ -213,7 +216,8 @@ int main (int argc, char* argv[])
 	}
 
 	string const film_dir = argv[optind];
-			
+
+	dcpomatic_setup_path_encoding ();
 	dcpomatic_setup ();
 
 	shared_ptr<Film> film;
@@ -247,7 +251,7 @@ int main (int argc, char* argv[])
 		if (output.empty ()) {
 			error ("you must specify --output");
 		}
-		
+
 		dcp::Certificate certificate (dcp::file_to_string (certificate_file));
 		dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
 		kdm.as_xml (output);
@@ -276,7 +280,7 @@ int main (int argc, char* argv[])
 				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";
 				}
@@ -284,7 +288,7 @@ int main (int argc, char* argv[])
 				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";
 				}