X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=345b905457d8415ae3b7e7edf78d6e3f054c8a3c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=4068dc51a0b833449e92b40d1f1e876d885180d8;hpb=5ea52a08f45b0cb8b8fe7221244cdcdeeaca0ed7;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 4068dc51a..345b90545 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/tools/dcpomatic_kdm.cc
+ *  @brief Command-line program to generate KDMs.
+ */
+
 #include <getopt.h>
 #include <dcp/certificates.h>
 #include "lib/film.h"
@@ -24,17 +28,15 @@
 #include "lib/kdm.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
+#include "lib/safe_stringstream.h"
 
 using std::string;
-using std::stringstream;
 using std::cout;
 using std::cerr;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
 
-static string program_name;
-
 static void
 help ()
 {
@@ -76,7 +78,7 @@ time_from_string (string t)
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
-	stringstream s (d);
+	SafeStringStream s (d);
 	int N;
 	string unit;
 	s >> N >> unit;
@@ -114,7 +116,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[] = {
@@ -177,7 +179,7 @@ int main (int argc, char* argv[])
 			} else if (string (optarg) == "dci-specific") {
 				formulation = dcp::DCI_SPECIFIC;
 			} else {
-				error ("unrecognised KDM formulation " + formulation);
+				error ("unrecognised KDM formulation " + string (optarg));
 			}
 		}
 	}
@@ -213,7 +215,7 @@ int main (int argc, char* argv[])
 	}
 
 	string const film_dir = argv[optind];
-			
+
 	dcpomatic_setup ();
 
 	shared_ptr<Film> film;
@@ -247,8 +249,8 @@ int main (int argc, char* argv[])
 		if (output.empty ()) {
 			error ("you must specify --output");
 		}
-		
-		shared_ptr<dcp::Certificate> certificate (new dcp::Certificate (dcp::file_to_string (certificate_file)));
+
+		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);
 		if (verbose) {
@@ -276,7 +278,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 +286,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";
 				}