C++11 and whitespace cleanups.

[dcpomatic.git] / src / lib / check_content_change_job.cc

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index 0862ab085323eaac5966b34358b0760a1d5ebf5b..16ef8d86485391bb6724eb190055f4fdb94ce6d2 100644 (file)
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -18,20 +18,22 @@
 
 */
 
+
 #include "check_content_change_job.h"
-#include "job_manager.h"
-#include "examine_content_job.h"
 #include "content.h"
+#include "examine_content_job.h"
 #include "film.h"
-#include <boost/foreach.hpp>
+#include "job_manager.h"
 #include <iostream>
 
 #include "i18n.h"
 
-using std::string;
-using std::list;
+
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
 
 CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
        : Job (film)
@@ -39,10 +41,15 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
 
 }
 
+CheckContentChangeJob::~CheckContentChangeJob ()
+{
+       stop_thread ();
+}
+
 string
 CheckContentChangeJob::name () const
 {
-       return _("Check content for changes");
+       return _("Checking content for changes");
 }
 
 string
@@ -56,30 +63,15 @@ CheckContentChangeJob::run ()
 {
        set_progress_unknown ();
 
-       list<shared_ptr<Content> > changed;
-
-       BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
-               bool ic = false;
-               for (size_t j = 0; j < i->number_of_paths(); ++j) {
-                       cout << boost::filesystem::last_write_time(i->path(j)) << " " << i->last_write_time(j) << "\n";
-                       if (boost::filesystem::last_write_time(i->path(j)) != i->last_write_time(j)) {
-                               cout << "last write differs.\n";
-                               ic = true;
-                               break;
-                       }
-               }
-               if (!ic && i->calculate_digest() != i->digest()) {
-                       cout << "digest differs.\n";
-                       ic = true;
-               }
-               if (ic) {
-                       cout << i->path(0) << " changed.\n";
-                       changed.push_back (i);
-               }
-       }
+       auto content = _film->content();
+       std::vector<shared_ptr<Content>> changed;
+       std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr<Content> c) { return c->changed(); });
 
-       BOOST_FOREACH (shared_ptr<Content> i, changed) {
-               JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
+       if (!changed.empty()) {
+               for (auto i: changed) {
+                       JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i));
+               }
+               set_message (_("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."));
        }
 
        set_progress (1);