summaryrefslogtreecommitdiff
path: root/src/decrypted_kdm.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-05 00:24:27 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 14:37:02 +0100
commitb06b12ad345ef9aadc2f53228cec1036e6174f29 (patch)
tree40dd4f23d7a7e0bd7b75f32da2df91a735c5e929 /src/decrypted_kdm.cc
parent82787546680784a2a6e0993ab5b570f0db3a2d4d (diff)
Rename some mxf variables to asset.
Diffstat (limited to 'src/decrypted_kdm.cc')
-rw-r--r--src/decrypted_kdm.cc13
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 ()));
}
}
}