X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcheck_content_change_job.cc;h=967291bb37344a3a455708aae7175da37a2fedd3;hp=644e730bbacf7025fe050e4f30fc9b67d80793e5;hb=07b21bb92a8d54c6c03de9aadc63ab93b65d9bc5;hpb=ebce2111f20e6b9cbd00ce8ec7e72c68cf176c29 diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc index 644e730bb..967291bb3 100644 --- a/src/lib/check_content_change_job.cc +++ b/src/lib/check_content_change_job.cc @@ -23,7 +23,6 @@ #include "examine_content_job.h" #include "content.h" #include "film.h" -#include #include #include "i18n.h" @@ -31,7 +30,7 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; /** @param gui true if we are running this job from the GUI, false if it's the CLI */ CheckContentChangeJob::CheckContentChangeJob (shared_ptr film, shared_ptr following, bool gui) @@ -64,27 +63,13 @@ CheckContentChangeJob::run () { set_progress_unknown (); - list > changed; - - BOOST_FOREACH (shared_ptr i, _film->content()) { - bool ic = false; - for (size_t j = 0; j < i->number_of_paths(); ++j) { - if (boost::filesystem::last_write_time(i->path(j)) != i->last_write_time(j)) { - ic = true; - break; - } - } - if (!ic && i->calculate_digest() != i->digest()) { - ic = true; - } - if (ic) { - changed.push_back (i); - } - } + auto content = _film->content(); + std::vector> changed; + std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); if (!changed.empty()) { if (_gui) { - BOOST_FOREACH (shared_ptr i, changed) { + for (auto i: changed) { JobManager::instance()->add(shared_ptr(new ExamineContentJob(_film, i))); } string m = _("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings.");