# 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
for (auto i: dcps) {
for (auto j: dcps) {
if (i != j) {
- i->resolve_refs (j->assets (true));
+ i->resolve_refs(j->assets());
}
}
}
#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>
}
}
- 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;
}
#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>
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;
}
}