diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
| commit | 488e3d1bd5e6b17d49f6db4df14c64f4b64db89b (patch) | |
| tree | 641fcf167b845df6eca68c54fdf1110a7a07a739 /src/decrypted_kdm.cc | |
| parent | 51ae14c7e304d4fbc8d7524d584f3f4762d51f67 (diff) | |
Remove ReelEncryptableAsset and tidy up a bit.
Diffstat (limited to 'src/decrypted_kdm.cc')
| -rw-r--r-- | src/decrypted_kdm.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 447a0a12..03c5ea26 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -37,17 +37,17 @@ */ +#include "certificate_chain.h" +#include "compose.hpp" +#include "cpl.h" +#include "dcp_assert.h" #include "decrypted_kdm.h" #include "decrypted_kdm_key.h" #include "encrypted_kdm.h" -#include "reel_encryptable_asset.h" +#include "exceptions.h" #include "reel_asset.h" +#include "reel_file_asset.h" #include "util.h" -#include "exceptions.h" -#include "cpl.h" -#include "certificate_chain.h" -#include "dcp_assert.h" -#include "compose.hpp" #include <asdcp/AS_DCP.h> #include <asdcp/KM_util.h> #include <openssl/rsa.h> @@ -251,7 +251,7 @@ DecryptedKDM::DecryptedKDM ( DecryptedKDM::DecryptedKDM ( string cpl_id, - map<shared_ptr<const ReelEncryptableAsset>, Key> keys, + map<shared_ptr<const ReelFileAsset>, Key> keys, LocalTime not_valid_before, LocalTime not_valid_after, string annotation_text, @@ -264,7 +264,7 @@ DecryptedKDM::DecryptedKDM ( , _content_title_text (content_title_text) , _issue_date (issue_date) { - for (map<shared_ptr<const ReelEncryptableAsset>, Key>::const_iterator i = keys.begin(); i != keys.end(); ++i) { + for (map<shared_ptr<const ReelFileAsset>, Key>::const_iterator i = keys.begin(); i != keys.end(); ++i) { add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id, Standard::SMPTE); } } @@ -287,9 +287,9 @@ DecryptedKDM::DecryptedKDM ( { /* Create DecryptedKDMKey objects for each encryptable asset */ bool did_one = false; - for (auto i: cpl->reel_encryptable_assets()) { - if (i->key_id()) { - add_key (i->key_type(), i->key_id().get(), key, cpl->id(), Standard::SMPTE); + for (auto i: cpl->reel_file_assets()) { + if (i->encryptable()) { + add_key (i->key_type().get(), i->key_id().get(), key, cpl->id(), Standard::SMPTE); did_one = true; } } |