Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / tools / dcpomatic_kdm_cli.cc

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 67ba2db9a7165149e5c10821cfdb7cffb39a6680..aa3022c30a5c205edb037732b62befc9ee108f46 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -21,14 +21,15 @@
  *  @brief Command-line program to generate KDMs.
  */
 
-#include <getopt.h>
-#include <dcp/certificate.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/kdm.h"
+#include "lib/screen_kdm.h"
+#include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
 #include "lib/safe_stringstream.h"
+#include <dcp/certificate.h>
+#include <getopt.h>
 #include <iostream>
 
 using std::string;
@@ -276,18 +277,18 @@ int main (int argc, char* argv[])
                }
 
                try {
+                       list<ScreenKDM> screen_kdms = film->make_kdms (
+                               (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+                               );
+
                        if (zip) {
-                               write_kdm_zip_files (
-                                       film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
-                                       );
+                               CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
 
                                if (verbose) {
                                        cout << "Wrote ZIP files to " << output << "\n";
                                }
                        } else {
-                               write_kdm_files (
-                                       film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
-                                       );
+                               ScreenKDM::write_files (film->name(), screen_kdms, output);
 
                                if (verbose) {
                                        cout << "Wrote KDM files to " << output << "\n";