Remove the need for ScreenKDM::collect.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index b112914b340241d7958e95b29af50cbf6bc576a8..37d5c344743e96895ecbd5b5c9cde8ec77ffac59 100644 (file)
--- 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 aa7be939ea950262a52f2ff9d677ca7982643bd6..0aa08e42586c38c6b451ba650e6bd820110e3b37 100644 (file)
--- 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 af0f0a3dd09aaa265bd124e64d6e48d4a1aaabc5..c295126966c66f2d1f3010ab59df3bd44d26b92b 100644 (file)
--- 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 510480c90892c17cfa1e274fe1921dfba45eed03..c2928114f649838a04c21ce1115e33c8a8ae3db1 100644 (file)
--- 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 926ff6ee8cdfaf293b3808d3902bce947a99ae2b..0342acd53105ed50e0948085fb7a27cf9851fd55 100644 (file)
--- 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 6e20dda9e074884cd6ae71e31110bee555daeb24..36817eb530496473c2861d6ca301f6f3590441a9 100644 (file)
--- 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 cf28ec53f722efb5e0e0f76af50417021fe6211f..713db3ce558e4982740b01ca43ef6cda47bb1a98 100644 (file)
--- 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) {