Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / decrypted_kdm.cc

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 447a0a12ee95a0d0fe93b65ca21d15747ee11e57..03c5ea26a25196ce544b932ca4832c9c500a4917 100644 (file)
--- 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;
                }
        }