diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-05 00:24:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 00:24:27 +0100 |
| commit | 1ff07140d485d1a3328156957b1a3e9ae21195fa (patch) | |
| tree | c5c093d881dd2e23bf724a968449f98aec9e639d /src/decrypted_kdm.cc | |
| parent | f1e3b6a67a2aa6aa358188d1af23fdd787c1284f (diff) | |
Rename some mxf variables to asset.1.0-shuffle
Diffstat (limited to 'src/decrypted_kdm.cc')
| -rw-r--r-- | src/decrypted_kdm.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 68429a73..d3b2d322 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -24,7 +24,6 @@ #include "util.h" #include "exceptions.h" #include "cpl.h" -#include "mxf.h" #include "signer.h" #include "dcp_assert.h" #include "AS_DCP.h" @@ -198,14 +197,14 @@ DecryptedKDM::DecryptedKDM ( , _content_title_text (content_title_text) , _issue_date (issue_date) { - /* Create DecryptedKDMKey objects for each MXF asset */ + /* Create DecryptedKDMKey objects for each encryptable asset */ BOOST_FOREACH(shared_ptr<const ReelAsset> i, cpl->reel_assets ()) { - shared_ptr<const ReelEncryptableAsset> mxf = boost::dynamic_pointer_cast<const ReelEncryptableAsset> (i); - if (mxf) { - if (!mxf->key_id ()) { - throw NotEncryptedError (mxf->id()); + shared_ptr<const ReelEncryptableAsset> asset = boost::dynamic_pointer_cast<const ReelEncryptableAsset> (i); + if (asset) { + if (!asset->key_id ()) { + throw NotEncryptedError (asset->id()); } - _keys.push_back (DecryptedKDMKey (mxf->key_type(), mxf->key_id().get(), key, cpl->id ())); + _keys.push_back (DecryptedKDMKey (asset->key_type(), asset->key_id().get(), key, cpl->id ())); } } } |