Trying to create export audio encoders with between 9 and 15 channels

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

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index fa9f5f721d04d09bd76eb5729b402dbe7cee554c..e40a9496dd678897e8fa3d7f1abd6fec8fd6a74a 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>
@@ -34,8 +35,7 @@
 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);
+using boost::dynamic_pointer_cast;
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
 list<shared_ptr<dcp::CPL> >
@@ -43,10 +43,19 @@ 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);
+               list<shared_ptr<dcp::DCPReadError> > errors;
+               dcp->read (true, &errors, true);
+               /** We accept and ignore EmptyAssetPathError but everything else is bad */
+               BOOST_FOREACH (shared_ptr<dcp::DCPReadError> j, errors) {
+                       if (dynamic_pointer_cast<dcp::EmptyAssetPathError>(j)) {
+                               LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
+                       } else {
+                               boost::throw_exception(*j.get());
+                       }
+               }
                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()) {