X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=df57f2d47143a470b1ed88ae11a6e0ac699abf4b;hb=2bec3708fc744c18128c5bdb4c2a332f5c8eb283;hp=9519b309729db5ed323ccdd7bcd8ef0ad93a9d1d;hpb=b029cb06c4e0fca1fad9fecd78939efe5532fa9a;p=dcpomatic.git diff --git a/src/lib/types.cc b/src/lib/types.cc index 9519b3097..df57f2d47 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -21,12 +21,15 @@ #include "types.h" #include "compose.hpp" #include "dcpomatic_assert.h" +#include "warnings.h" #include #include #include #include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include @@ -194,10 +197,14 @@ CPLSummary::CPLSummary (boost::filesystem::path p) : dcp_directory (p.leaf().string()) { dcp::DCP dcp (p); + list notes; dcp.read (¬es); - if (!notes.empty()) { - throw dcp::ReadError(dcp::note_to_string(notes.front())); + BOOST_FOREACH (dcp::VerificationNote i, notes) { + if (i.code() != dcp::VerificationNote::EXTERNAL_ASSET) { + /* It's not just a warning about this DCP being a VF */ + throw dcp::ReadError(dcp::note_to_string(i)); + } } cpl_id = dcp.cpls().front()->id();