summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-07 11:47:27 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-09 13:44:53 +0100
commit4121af462c1e8b98866ca206a64678fcba96fde7 (patch)
tree8970b97caf442ad6f54db897b87535ffe87cebbf /src/tools/dcpomatic.cc
parent7beb2cf613c7d310493fa39f9ef611b35f8f3d58 (diff)
Try to clean up KDM creation code a bit.
Diffstat (limited to 'src/tools/dcpomatic.cc')
-rw-r--r--src/tools/dcpomatic.cc8
1 files changed, 6 insertions, 2 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 ()))