diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-20 23:42:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-20 23:42:28 +0100 |
| commit | cb6729aa79b555b219974207fbe2ff0510f9d3ea (patch) | |
| tree | 973024e5dbf8bd8d873850909665e6229138ef57 /src/lib/dcp.cc | |
| parent | d24251b2e0d82236f93ee5415b72849dee2a0ac8 (diff) | |
Bump libdcp for better verification, and make API adjustments.
Diffstat (limited to 'src/lib/dcp.cc')
| -rw-r--r-- | src/lib/dcp.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index 421dbbf83..05b71557e 100644 --- a/src/lib/dcp.cc +++ b/src/lib/dcp.cc @@ -34,20 +34,22 @@ using std::list; using std::string; using std::shared_ptr; +using std::make_shared; using std::dynamic_pointer_cast; +using std::vector; /** Find all the CPLs in our directories, cross-add assets and return the CPLs */ list<shared_ptr<dcp::CPL> > DCP::cpls () const { - list<shared_ptr<dcp::DCP> > dcps; - list<shared_ptr<dcp::CPL> > cpls; + list<shared_ptr<dcp::DCP>> dcps; + list<shared_ptr<dcp::CPL>> cpls; LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size()); for (auto i: _dcp_content->directories()) { - shared_ptr<dcp::DCP> dcp (new dcp::DCP (i)); - list<dcp::VerificationNote> notes; + auto dcp = make_shared<dcp::DCP>(i); + vector<dcp::VerificationNote> notes; dcp->read (¬es, true); if (!_tolerant) { /** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */ |