From: Carl Hetherington <cth@carlh.net>
Date: Fri, 17 Feb 2023 23:15:10 +0000 (+0100)
Subject: Add verify_dcp().
X-Git-Tag: v2.16.56~13
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a4c510f8e3730d918c5ba54b1b4aaf307d748e0f

Add verify_dcp().
---

diff --git a/test/test.cc b/test/test.cc
index c91701e55..354a79e26 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -937,12 +937,9 @@ void progress (float) {}
 
 
 void
-make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code> ignore)
+verify_dcp(boost::filesystem::path dir, vector<dcp::VerificationNote::Code> ignore)
 {
-	film->write_metadata ();
-	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
-	BOOST_REQUIRE (!wait_for_jobs());
-	auto notes = dcp::verify({film->dir(film->dcp_name())}, &stage, &progress, {}, TestPaths::xsd());
+	auto notes = dcp::verify({dir}, &stage, &progress, {}, TestPaths::xsd());
 	bool ok = true;
 	for (auto i: notes) {
 		if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {
@@ -954,6 +951,16 @@ make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code>
 }
 
 
+void
+make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code> ignore)
+{
+	film->write_metadata ();
+	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
+	BOOST_REQUIRE (!wait_for_jobs());
+	verify_dcp({film->dir(film->dcp_name())}, ignore);
+}
+
+
 void
 check_int_close (int a, int b, int d)
 {
diff --git a/test/test.h b/test/test.h
index 8399abf9a..01ddb1987 100644
--- a/test/test.h
+++ b/test/test.h
@@ -75,6 +75,7 @@ boost::filesystem::path dcp_file (std::shared_ptr<const Film> film, std::string
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
 extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
+extern void verify_dcp(boost::filesystem::path dir, std::vector<dcp::VerificationNote::Code> ignore);
 extern void make_and_verify_dcp (std::shared_ptr<Film> film, std::vector<dcp::VerificationNote::Code> ignore = {});
 extern void check_int_close (int a, int b, int d);
 extern void check_int_close (std::pair<int, int>, std::pair<int, int>, int d);