Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

[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
deleted file mode 100644 (file)
index 644e730..0000000
--- a/src/lib/check_content_change_job.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "check_content_change_job.h"
-#include "job_manager.h"
-#include "examine_content_job.h"
-#include "content.h"
-#include "film.h"
-#include <boost/foreach.hpp>
-#include <iostream>
-
-#include "i18n.h"
-
-using std::string;
-using std::list;
-using std::cout;
-using boost::shared_ptr;
-
-/** @param gui true if we are running this job from the GUI, false if it's the CLI */
-CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, shared_ptr<Job> following, bool gui)
-       : Job (film)
-       , _following (following)
-       , _gui (gui)
-{
-
-}
-
-CheckContentChangeJob::~CheckContentChangeJob ()
-{
-       stop_thread ();
-}
-
-string
-CheckContentChangeJob::name () const
-{
-       return _("Checking content for changes");
-}
-
-string
-CheckContentChangeJob::json_name () const
-{
-       return N_("check_content_change");
-}
-
-void
-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) {
-                       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);
-               }
-       }
-
-       if (!changed.empty()) {
-               if (_gui) {
-                       BOOST_FOREACH (shared_ptr<Content> i, changed) {
-                               JobManager::instance()->add(shared_ptr<Job>(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.");
-                       if (_following) {
-                               /* I'm assuming that _following is a make DCP job */
-                               m += "  ";
-                               m += _("Choose 'Make DCP' again when you have done this.");
-                       }
-                       set_message (m);
-               } else {
-                       set_progress (1);
-                       set_state (FINISHED_ERROR);
-                       set_error (
-                               _("Some files have been changed since they were added to the project.  Open the project in DCP-o-matic, check the settings, then save it before trying again."),
-                               ""
-                               );
-                       return;
-               }
-       } else if (_following) {
-               JobManager::instance()->add (_following);
-       }
-
-       /* Only set this job as finished once we have added the following job, otherwise I think
-          it's possible that the tests will sporadically fail if they check for all jobs being
-          complete in the gap between this one finishing and _following being added.
-       */
-
-       set_progress (1);
-       set_state (FINISHED_OK);
-}