Adjust for changes to libdcp API.

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 2db49bda5ab6cc657dae842f8560c40fdcd9a7db..48b704777423d8a7c20e75dbb27a6efc8cc7e67a 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -72,15 +72,15 @@ DCP::cpls () const
        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));
-               list<shared_ptr<dcp::DCPReadError> > errors;
-               dcp->read (_tolerant, &errors, true);
+               list<dcp::VerificationNote> notes;
+               dcp->read (&notes, true);
                if (!_tolerant) {
                        /** 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)) {
+                       BOOST_FOREACH (dcp::VerificationNote j, notes) {
+                               if (j.code() == dcp::VerificationNote::Code::EMPTY_ASSET_PATH) {
                                        LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
                                } else {
-                                       boost::throw_exception(*j.get());
+                                       boost::throw_exception(dcp::DCPReadError(dcp::note_to_string(j)));
                                }
                        }
                }

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 43b5fb7e13f50d3672eac81434b0a9e2409f5ee6..8966a65e700eb84b8f3945eb7d81987d8c88f7b5 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -180,12 +180,6 @@ Job::run_wrapper ()
                set_progress (1);
                set_state (FINISHED_ERROR);
 
-       } catch (dcp::MissingAssetError& e) {
-
-               set_error (e.message(), e.path().string());
-               set_progress (1);
-               set_state (FINISHED_ERROR);
-
        } catch (dcp::DCPReadError& e) {
 
                set_error (e.message(), e.detail().get_value_or(""));