Make player more tolerant of some DCP errors.

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

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index fa9f5f721d04d09bd76eb5729b402dbe7cee554c..0b80a3737db0e1903cec10d64367b7b23f365669 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "film.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
 #include "dcp_content.h"
 #include <dcp/dcp.h>
@@ -35,8 +36,6 @@ using std::list;
 using std::string;
 using boost::shared_ptr;
 
-#define LOG_GENERAL(...) _dcp_content->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
 list<shared_ptr<dcp::CPL> >
 DCP::cpls () const
@@ -44,9 +43,10 @@ DCP::cpls () const
        list<shared_ptr<dcp::DCP> > dcps;
        list<shared_ptr<dcp::CPL> > cpls;
 
+       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 (false, 0, true);
+               dcp->read (_tolerant, 0, true);
                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()) {