From: Carl Hetherington <cth@carlh.net>
Date: Wed, 7 Oct 2015 11:03:10 +0000 (+0100)
Subject: Remove the need for ScreenKDM::collect.
X-Git-Tag: v2.4.6~44
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=9d63be286e8bc09dd1cf8deea5c58dda0a534c1e;p=dcpomatic.git

Remove the need for ScreenKDM::collect.
---

diff --git a/src/lib/film.cc b/src/lib/film.cc
index b112914b3..37d5c3447 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -49,6 +49,7 @@
 #include "subtitle_content.h"
 #include "ffmpeg_content.h"
 #include "dcp_content.h"
+#include "screen_kdm.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -1108,7 +1109,7 @@ Film::make_kdm (
 		).encrypt (signer, target, formulation);
 }
 
-list<dcp::EncryptedKDM>
+list<ScreenKDM>
 Film::make_kdms (
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
@@ -1117,11 +1118,11 @@ Film::make_kdms (
 	dcp::Formulation formulation
 	) const
 {
-	list<dcp::EncryptedKDM> kdms;
+	list<ScreenKDM> kdms;
 
-	for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
-		if ((*i)->certificate) {
-			kdms.push_back (make_kdm ((*i)->certificate.get(), dcp, from, until, formulation));
+	BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+		if (i->certificate) {
+			kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation)));
 		}
 	}
 
diff --git a/src/lib/film.h b/src/lib/film.h
index aa7be939e..0aa08e425 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -54,6 +54,7 @@ class AudioProcessor;
 class AudioMapping;
 class Ratio;
 class Job;
+class ScreenKDM;
 struct isdcf_name_test;
 
 /** @class Film
@@ -127,7 +128,7 @@ public:
 		dcp::Formulation formulation
 		) const;
 
-	std::list<dcp::EncryptedKDM> make_kdms (
+	std::list<ScreenKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index af0f0a3dd..c29512696 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -40,22 +40,6 @@ ScreenKDM::filename (shared_ptr<const Film> film) const
 	return tidy_for_filename (film->name()) + "_" + tidy_for_filename (screen->cinema->name) + "_" + tidy_for_filename (screen->name) + ".kdm.xml";
 }
 
-list<ScreenKDM>
-ScreenKDM::collect (list<shared_ptr<Screen> > screens, list<dcp::EncryptedKDM> kdms)
-{
-	list<ScreenKDM> screen_kdms;
-
-	list<shared_ptr<Screen> >::iterator i = screens.begin ();
-	list<dcp::EncryptedKDM>::iterator j = kdms.begin ();
-	while (i != screens.end() && j != kdms.end ()) {
-		screen_kdms.push_back (ScreenKDM (*i, *j));
-		++i;
-		++j;
-	}
-
-	return screen_kdms;
-}
-
 void
 ScreenKDM::write_files (shared_ptr<const Film> film, list<ScreenKDM> screen_kdms, boost::filesystem::path directory)
 {
diff --git a/src/lib/screen_kdm.h b/src/lib/screen_kdm.h
index 510480c90..c2928114f 100644
--- a/src/lib/screen_kdm.h
+++ b/src/lib/screen_kdm.h
@@ -37,7 +37,6 @@ public:
 
 	std::string filename (boost::shared_ptr<const Film> film) const;
 
-	static std::list<ScreenKDM> collect (std::list<boost::shared_ptr<Screen> > screens, std::list<dcp::EncryptedKDM> kdms);
 	static void write_files (boost::shared_ptr<const Film> film, std::list<ScreenKDM> screen_kdms, boost::filesystem::path directory);
 
 	boost::shared_ptr<Screen> screen;
diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 926ff6ee8..0342acd53 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -67,7 +67,7 @@ SendKDMEmailJob::run ()
 
 		CinemaKDMs::email (
 			_film,
-			CinemaKDMs::collect (ScreenKDM::collect (_screens, _film->make_kdms (_screens, _cpl, _from, _to, _formulation))),
+			CinemaKDMs::collect (_film->make_kdms (_screens, _cpl, _from, _to, _formulation)),
 			_from,
 			_to
 			);
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) {