diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-10-15 00:52:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-10-15 00:52:58 +0100 |
| commit | 9476c535e929974cc11070002938bbc9476cce32 (patch) | |
| tree | d636abc4e63b0bc24af6a6494fb87d7c70b3d45b /src/lib | |
| parent | 8726c70cc1b14dc996c18670cdcda0b4d670605e (diff) | |
Add KDMs after resolving asset references; don't complain
if a single KDM fails to decrypt a VF/OV combination.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index 6d5c0b291..f58b06b57 100644 --- a/src/lib/dcp.cc +++ b/src/lib/dcp.cc @@ -38,9 +38,6 @@ DCP::cpls () const BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) { shared_ptr<dcp::DCP> dcp (new dcp::DCP (i)); dcp->read (false, 0, true); - if (_dcp_content->kdm ()) { - dcp->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ())); - } dcps.push_back (dcp); BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) { cpls.push_back (i); @@ -55,5 +52,11 @@ DCP::cpls () const } } + if (_dcp_content->kdm ()) { + BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) { + i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ())); + } + } + return cpls; } |