More libdcp API tweaks.

diff --git a/cscript b/cscript
index b8ff23e9ddcb4cb47ef6f5415081fc9098e6026a..6e5712bcf82f7c9aee8421df381dc1cee4aaf717 100644 (file)
--- a/cscript
+++ b/cscript
@@ -385,8 +385,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'ee23803'))
-    deps.append(('libsub', 'e88528d'))
+    deps.append(('libdcp', '274dd30'))
+    deps.append(('libsub', '276532e'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index d99c32bf3b8fc928504e3d0d8d78c00a6c6a5155..d544025ccc48bd30ba10e0a2819aaf48928e12f6 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -72,7 +72,7 @@ DCP::cpls () const
        for (auto i: dcps) {
                for (auto j: dcps) {
                        if (i != j) {
-                               i->resolve_refs (j->assets (true));
+                               i->resolve_refs(j->assets());
                        }
                }
        }

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 53d91a3788b04131477e4d1f697f7d5a4b614806..c57fc165cf9a1b72db957cccd2ac8ef4dff8092f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -65,7 +65,6 @@
 #include <dcp/decrypted_kdm.h>
 #include <dcp/raw_convert.h>
 #include <dcp/reel_file_asset.h>
-#include <dcp/reel_encryptable_asset.h>
 #include <dcp/reel_asset.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
@@ -1665,10 +1664,10 @@ Film::make_kdm (
                }
        }
 
-       map<shared_ptr<const dcp::ReelEncryptableAsset>, dcp::Key> keys;
+       map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
 
-       for (auto i: cpl->reel_encryptable_assets()) {
-               if (!i->key_id()) {
+       for (auto i: cpl->reel_file_assets()) {
+               if (!i->encrypted()) {
                        continue;
                }
 

diff --git a/src/lib/types.cc b/src/lib/types.cc
index dbbae3e6a5972ac073246146e8812bcec1c62bf0..228ebf28f6d47bc442e12d8b4f43540c66ae1189 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -26,7 +26,6 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel_file_asset.h>
-#include <dcp/reel_encryptable_asset.h>
 #include <dcp/reel_asset.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
@@ -214,8 +213,8 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 
        encrypted = false;
        for (auto j: dcp.cpls()) {
-               for (auto k: j->reel_encryptable_assets()) {
-                       if (k->key_id()) {
+               for (auto k: j->reel_file_assets()) {
+                       if (k->encrypted()) {
                                encrypted = true;
                        }
                }