From 9d63be286e8bc09dd1cf8deea5c58dda0a534c1e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 7 Oct 2015 12:03:10 +0100
Subject: Remove the need for ScreenKDM::collect.

---
 src/tools/dcpomatic.cc         | 2 +-
 src/tools/dcpomatic_kdm_cli.cc | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6e20dda9e..36817eb53 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -448,7 +448,7 @@ private:
 			if (d->write_to ()) {
 				ScreenKDM::write_files (
 					_film,
-					ScreenKDM::collect (d->screens(), _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation())),
+					_film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation()),
 					d->directory()
 					);
 			} else {
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index cf28ec53f..713db3ce5 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -277,9 +277,8 @@ 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)
+			list<ScreenKDM> screen_kdms = film->make_kdms (
+				(*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
 				);
 
 			if (zip) {
-- 
cgit v1.2.3