diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-17 01:27:02 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-10 23:43:42 +0100 |
| commit | 2596b1db2fff8a9cc56be97099442dc791692882 (patch) | |
| tree | 519faf7567e5d19276067ee244ad21ee24ac5c9e /src/lib/film.cc | |
| parent | 8c365af343a15bee11af53fc6bc16487b83260d1 (diff) | |
Basics of marker writing (part of #782).
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index b40b439f5..0b2b67801 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1377,26 +1377,25 @@ Film::make_kdm ( map<shared_ptr<const dcp::ReelMXF>, dcp::Key> keys; - BOOST_FOREACH(shared_ptr<const dcp::ReelAsset> i, cpl->reel_assets ()) { - shared_ptr<const dcp::ReelMXF> mxf = boost::dynamic_pointer_cast<const dcp::ReelMXF> (i); - if (!mxf || !mxf->key_id()) { + BOOST_FOREACH(shared_ptr<const dcp::ReelMXF> i, cpl->reel_mxfs()) { + if (!i->key_id()) { continue; } /* Get any imported key for this ID */ bool done = false; BOOST_FOREACH (dcp::DecryptedKDMKey j, imported_keys) { - if (j.id() == mxf->key_id().get()) { - LOG_GENERAL ("Using imported key for %1", mxf->key_id().get()); - keys[mxf] = j.key(); + if (j.id() == i->key_id().get()) { + LOG_GENERAL ("Using imported key for %1", i->key_id().get()); + keys[i] = j.key(); done = true; } } if (!done) { /* No imported key; it must be an asset that we encrypted */ - LOG_GENERAL ("Using our own key for %1", mxf->key_id().get()); - keys[mxf] = key(); + LOG_GENERAL ("Using our own key for %1", i->key_id().get()); + keys[i] = key(); } } |