From: Carl Hetherington <cth@carlh.net>
Date: Tue, 13 Apr 2021 23:01:13 +0000 (+0200)
Subject: More libdcp API tweaks.
X-Git-Tag: v2.15.140~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d5c220f76907f0113bf0b5d3a7e26e5b27197a17

More libdcp API tweaks.
---

diff --git a/cscript b/cscript
index b8ff23e9d..6e5712bcf 100644
--- 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 d99c32bf3..d544025cc 100644
--- 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 53d91a378..c57fc165c 100644
--- 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 dbbae3e6a..228ebf28f 100644
--- 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;
 			}
 		}