diff options
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/dcp.cc | 13 | ||||
| -rw-r--r-- | wscript | 8 |
3 files changed, 17 insertions, 8 deletions
@@ -344,8 +344,8 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.12')) - deps.append(('libsub', 'v1.4.14')) + deps.append(('libdcp', 'v1.6.13')) + deps.append(('libsub', 'v1.4.15')) deps.append(('rtaudio-cdist', 'bf0fc23')) return deps diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index f506d5c70..e40a9496d 100644 --- 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; /** Find all the CPLs in our directories, cross-add assets and return the CPLs */ list<shared_ptr<dcp::CPL> > @@ -42,11 +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()) { @@ -313,21 +313,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.13', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] else: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.13', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] # libsub if conf.options.static_sub: - conf.check_cfg(package='libsub-1.0', atleast_version='1.4.13', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.15', args='--cflags', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] conf.env.STLIB_SUB = ['sub-1.0'] else: - conf.check_cfg(package='libsub-1.0', atleast_version='1.4.13', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.15', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ |