Try to clean up KDM creation code a bit.

2 files changed, 17 insertions, 11 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ac07e1785..6e20dda9e 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -46,7 +46,7 @@
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
-#include "lib/kdm.h"
+#include "lib/screen_kdm.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/server_finder.h"
 #include "lib/update_checker.h"
@@ -446,7 +446,11 @@ private:
 
 		try {
 			if (d->write_to ()) {
-				write_kdm_files (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation (), d->directory ());
+				ScreenKDM::write_files (
+					_film,
+					ScreenKDM::collect (d->screens(), _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation())),
+					d->directory()
+					);
 			} else {
 				JobManager::instance()->add (
 					shared_ptr<Job> (new SendKDMEmailJob (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ()))
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 67ba2db9a..cf28ec53f 100644
--- 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,19 @@ int main (int argc, char* argv[])
 		}
 
 		try {
+			list<ScreenKDM> screen_kdms = ScreenKDM::collect (
+				(*i)->screens(),
+				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, 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, screen_kdms, output);
 
 				if (verbose) {
 					cout << "Wrote KDM files to " << output << "\n";