X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp.cc;h=abdfc7f9eaad8aa92b223a44bab1c87f1f663dc1;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=421dbbf83b605fd23efa3aa4278e467af9a69a55;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 421dbbf83..abdfc7f9e 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,42 +18,51 @@
 
 */
 
-#include "dcp.h"
-#include "config.h"
-#include "film.h"
-#include "log.h"
-#include "dcpomatic_log.h"
+
 #include "compose.hpp"
+#include "dcp.h"
 #include "dcp_content.h"
+#include "dcpomatic_log.h"
+#include "log.h"
+#include "util.h"
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 
 #include "i18n.h"
 
+
 using std::list;
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 using std::dynamic_pointer_cast;
+using std::vector;
 
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
-list<shared_ptr<dcp::CPL> >
+list<shared_ptr<dcp::CPL>>
 DCP::cpls () const
 {
-	list<shared_ptr<dcp::DCP> > dcps;
-	list<shared_ptr<dcp::CPL> > cpls;
+	list<shared_ptr<dcp::DCP>> dcps;
+	list<shared_ptr<dcp::CPL>> cpls;
+
+	/** We accept and ignore some warnings / errors but everything else is bad */
+	vector<dcp::VerificationNote::Code> ignore = {
+		dcp::VerificationNote::Code::EMPTY_ASSET_PATH,
+		dcp::VerificationNote::Code::EXTERNAL_ASSET,
+		dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD,
+	};
 
 	LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size());
 	for (auto i: _dcp_content->directories()) {
-		shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
-		list<dcp::VerificationNote> notes;
+		auto dcp = make_shared<dcp::DCP>(i);
+		vector<dcp::VerificationNote> notes;
 		dcp->read (&notes, true);
 		if (!_tolerant) {
-			/** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
 			for (auto j: notes) {
-				if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::EXTERNAL_ASSET) {
-					LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
+				if (std::find(ignore.begin(), ignore.end(), j.code()) != ignore.end()) {
+					LOG_WARNING("Ignoring: %1", dcp::note_to_string(j));
 				} else {
 					boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
 				}
@@ -69,13 +78,13 @@ 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());
 			}
 		}
 	}
 
 	if (_dcp_content->kdm ()) {
-		dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+		auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
 		for (auto i: dcps) {
 			i->add (k);
 		}