X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=e9b412ded06bf2709b03601fce9fda9e6bd23325;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=dbbae3e6a5972ac073246146e8812bcec1c62bf0;hpb=cc99556229bf35506c20377f4550665af6f5594a;p=dcpomatic.git

diff --git a/src/lib/types.cc b/src/lib/types.cc
index dbbae3e6a..e9b412ded 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -21,16 +21,15 @@
 #include "types.h"
 #include "compose.hpp"
 #include "dcpomatic_assert.h"
-#include "warnings.h"
-#include <dcp/raw_convert.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/reel_file_asset.h>
-#include <dcp/reel_encryptable_asset.h>
+#include <dcp/raw_convert.h>
 #include <dcp/reel_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/reel_file_asset.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
 #include "i18n.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;
 			}
 		}