projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: make things a little clearer.
[dcpomatic.git]
/
src
/
lib
/
verify_dcp_job.cc
diff --git
a/src/lib/verify_dcp_job.cc
b/src/lib/verify_dcp_job.cc
index 8ac41d2a4b9f70fc4edea9cb957c4825e0056d48..e054fae3a8774e81594b1474b04966e3ffb11ef7 100644
(file)
--- a/
src/lib/verify_dcp_job.cc
+++ b/
src/lib/verify_dcp_job.cc
@@
-1,5
+1,5
@@
/*
/*
- 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.
This file is part of DCP-o-matic.
@@
-18,14
+18,22
@@
*/
*/
+
+#include "cross.h"
#include "verify_dcp_job.h"
#include "content.h"
#include "i18n.h"
#include "verify_dcp_job.h"
#include "content.h"
#include "i18n.h"
+
using std::string;
using std::vector;
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 (vector<boost::filesystem::path> directories)
: Job (shared_ptr<Film>())
@@
-34,26
+42,45
@@
VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
}
}
+
+VerifyDCPJob::~VerifyDCPJob ()
+{
+ stop_thread ();
+}
+
+
string
VerifyDCPJob::name () const
{
return _("Verify DCP");
}
string
VerifyDCPJob::name () const
{
return _("Verify DCP");
}
+
string
VerifyDCPJob::json_name () const
{
return N_("verify_dcp");
}
string
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 ()
{
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), {}, libdcp_resources_path() / "xsd"
);
bool failed = false;
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;
}
}
failed = true;
}
}