Fix the build for older macOS.

[dcpomatic.git] / src / lib / dcp.cc

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index f58b06b57f4aab65ed48ac282f59cb4c18d7792c..abdfc7f9eaad8aa92b223a44bab1c87f1f663dc1 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,43 +18,75 @@
 
 */
 
+
+#include "compose.hpp"
 #include "dcp.h"
-#include "config.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 <boost/foreach.hpp>
+#include <dcp/exceptions.h>
+
+#include "i18n.h"
+
 
 using std::list;
-using boost::shared_ptr;
+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;
 
-       BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
-               shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
-               dcp->read (false, 0, true);
+       /** 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()) {
+               auto dcp = make_shared<dcp::DCP>(i);
+               vector<dcp::VerificationNote> notes;
+               dcp->read (&notes, true);
+               if (!_tolerant) {
+                       for (auto j: notes) {
+                               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)));
+                               }
+                       }
+               }
                dcps.push_back (dcp);
-               BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {
+               LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
+               for (auto i: dcp->cpls()) {
                        cpls.push_back (i);
                }
        }
 
-       BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-               BOOST_FOREACH (shared_ptr<dcp::DCP> j, dcps) {
+       for (auto i: dcps) {
+               for (auto j: dcps) {
                        if (i != j) {
-                               i->resolve_refs (j->assets ());
+                               i->resolve_refs(j->assets());
                        }
                }
        }
 
        if (_dcp_content->kdm ()) {
-               BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-                       i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+               auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+               for (auto i: dcps) {
+                       i->add (k);
                }
        }