summaryrefslogtreecommitdiff
path: root/src/lib/film.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/film.cc')
-rw-r--r--src/lib/film.cc11
1 files changed, 6 insertions, 5 deletions
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)));
}
}