From 5973a7f38f109a2cce5ce83d032aa1a2d0a4fd8f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 21 Mar 2018 22:46:22 +0000
Subject: Update for new bits in libdcp verify.

---
 src/lib/verify_dcp_job.cc | 12 +++++++++++-
 src/lib/verify_dcp_job.h  |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index 8ac41d2a4..5fb2a59c1 100644
--- 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 f61e44372..0ed9669cc 100644
--- 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;
 };
-- 
cgit v1.2.3