Update for new bits in libdcp verify.

diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index 8ac41d2a4b9f70fc4edea9cb957c4825e0056d48..5fb2a59c1929d6caf9ac8cc5312dca84df901a7f 100644 (file)
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -26,6 +26,7 @@
 using std::string;
 using std::vector;
 using boost::shared_ptr;
+using boost::optional;
 
 VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
        : Job (shared_ptr<Film>())
@@ -46,10 +47,19 @@ VerifyDCPJob::json_name () const
        return N_("verify_dcp");
 }
 
+void
+VerifyDCPJob::update_stage (string s, optional<boost::filesystem::path> path)
+{
+       if (path) {
+               s += ": " + path->string();
+       }
+       sub (s);
+}
+
 void
 VerifyDCPJob::run ()
 {
-       _notes = dcp::verify (_directories);
+       _notes = dcp::verify (_directories, bind (&VerifyDCPJob::update_stage, this, _1, _2), bind (&VerifyDCPJob::set_progress, this, _1, false));
 
        bool failed = false;
        BOOST_FOREACH (dcp::VerificationNote i, _notes) {

diff --git a/src/lib/verify_dcp_job.h b/src/lib/verify_dcp_job.h
index f61e4437243b45ea363f9c8aaa4b11e76af93d43..0ed9669cc6de79133a8cfe462123eb2d292b3335 100644 (file)
--- a/src/lib/verify_dcp_job.h
+++ b/src/lib/verify_dcp_job.h
@@ -38,6 +38,8 @@ public:
        }
 
 private:
+       void update_stage (std::string s, boost::optional<boost::filesystem::path> path);
+
        std::vector<boost::filesystem::path> _directories;
        std::list<dcp::VerificationNote> _notes;
 };