projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various alignment tidying/fixups.
[dcpomatic.git]
/
src
/
lib
/
types.cc
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/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>
#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()) {
encrypted = false;
for (auto j: dcp.cpls()) {
- for (auto k: j->reel_
encryptab
le_assets()) {
- if (k->
key_i
d()) {
+ for (auto k: j->reel_
fi
le_assets()) {
+ if (k->
encrypte
d()) {
encrypted = true;
}
}
encrypted = true;
}
}