diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-14 01:01:13 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-14 01:01:13 +0200 |
| commit | d5c220f76907f0113bf0b5d3a7e26e5b27197a17 (patch) | |
| tree | 8e4f49956c61729f79565c6695d3bbd9e93159eb /src | |
| parent | cc99556229bf35506c20377f4550665af6f5594a (diff) | |
More libdcp API tweaks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 7 | ||||
| -rw-r--r-- | src/lib/types.cc | 5 |
3 files changed, 6 insertions, 8 deletions
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; } } |