Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index f3b3b44969cca6aacd9657e22f1465c4f18053d1..477b61e9f4849dc0a1c620a7f3f35eb7f423d994 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -35,6 +35,7 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 dcp::DecryptedKDM
 DCP::decrypted_kdm () const
@@ -71,7 +72,18 @@ DCP::cpls () const
        LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size());
        BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
                shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
-               dcp->read (_tolerant, 0, true);
+               list<dcp::VerificationNote> notes;
+               dcp->read (&notes, true);
+               if (!_tolerant) {
+                       /** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
+                       BOOST_FOREACH (dcp::VerificationNote 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());
+                               } else {
+                                       boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
+                               }
+                       }
+               }
                dcps.push_back (dcp);
                LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
                BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {