diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-07 11:47:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:44:53 +0100 |
| commit | 4121af462c1e8b98866ca206a64678fcba96fde7 (patch) | |
| tree | 8970b97caf442ad6f54db897b87535ffe87cebbf /src/tools/dcpomatic_kdm_cli.cc | |
| parent | 7beb2cf613c7d310493fa39f9ef611b35f8f3d58 (diff) | |
Try to clean up KDM creation code a bit.
Diffstat (limited to 'src/tools/dcpomatic_kdm_cli.cc')
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 20 |
1 files changed, 11 insertions, 9 deletions
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"; |