/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
+#include "cross.h"
#include "verify_dcp_job.h"
#include "content.h"
#include "i18n.h"
+
using std::string;
using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
: Job (shared_ptr<Film>())
}
+
+VerifyDCPJob::~VerifyDCPJob ()
+{
+ stop_thread ();
+}
+
+
string
VerifyDCPJob::name () const
{
return _("Verify DCP");
}
+
string
VerifyDCPJob::json_name () const
{
return N_("verify_dcp");
}
+
void
VerifyDCPJob::update_stage (string s, optional<boost::filesystem::path> path)
{
sub (s);
}
+
void
VerifyDCPJob::run ()
{
- _notes = dcp::verify (_directories, bind (&VerifyDCPJob::update_stage, this, _1, _2), bind (&VerifyDCPJob::set_progress, this, _1, false));
+ _notes = dcp::verify(_directories, bind(&VerifyDCPJob::update_stage, this, _1, _2), bind(&VerifyDCPJob::set_progress, this, _1, false), {}, libdcp_resources_path() / "xsd");
bool failed = false;
- BOOST_FOREACH (dcp::VerificationNote i, _notes) {
- if (i.type() == dcp::VerificationNote::VERIFY_ERROR) {
+ for (auto i: _notes) {
+ if (i.type() == dcp::VerificationNote::Type::ERROR) {
failed = true;
}
}