Allow re-start of cancelled subtitle analysis jobs.

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 5504251b00faa073a2be36747294400091e96209..86230db2b77a7653f86e46bf7165a51ccad84c82 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -166,9 +166,11 @@ JobManager::scheduler ()
 
                bool have_running = false;
                for (auto i: _jobs) {
-                       if (have_running && i->running()) {
+                       if ((have_running || _paused) && i->running()) {
+                               /* We already have a running job, or are totally paused, so this job should not be running */
                                i->pause_by_priority();
-                       } else if (!have_running && (i->is_new() || i->paused_by_priority())) {
+                       } else if (!have_running && !_paused && (i->is_new() || i->paused_by_priority())) {
+                               /* We don't have a running job, and we should have one, so start/resume this */
                                if (i->is_new()) {
                                        _connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
                                        i->start ();
@@ -227,7 +229,7 @@ JobManager::analyse_audio (
        shared_ptr<const Playlist> playlist,
        bool from_zero,
        boost::signals2::connection& connection,
-       function<void()> ready
+       function<void (Job::Result)> ready
        )
 {
        {
@@ -262,7 +264,7 @@ JobManager::analyse_subtitles (
        shared_ptr<const Film> film,
        shared_ptr<Content> content,
        boost::signals2::connection& connection,
-       function<void()> ready
+       function<void (Job::Result)> ready
        )
 {
        {
@@ -270,7 +272,7 @@ JobManager::analyse_subtitles (
 
                for (auto i: _jobs) {
                        auto a = dynamic_pointer_cast<AnalyseSubtitlesJob> (i);
-                       if (a && a->path() == film->subtitle_analysis_path(content)) {
+                       if (a && a->path() == film->subtitle_analysis_path(content) && !i->finished_cancelled()) {
                                i->when_finished (connection, ready);
                                return;
                        }
@@ -326,32 +328,21 @@ JobManager::decrease_priority (shared_ptr<Job> job)
 }
 
 
+/** Pause all job processing */
 void
 JobManager::pause ()
 {
        boost::mutex::scoped_lock lm (_mutex);
-
-       if (_paused_job) {
-               return;
-       }
-
-       for (auto i: _jobs) {
-               if (i->pause_by_user()) {
-                       _paused_job = i;
-               }
-       }
+       _paused = true;
+       _schedule_condition.notify_all();
 }
 
 
+/** Resume processing jobs after a previous pause() */
 void
 JobManager::resume ()
 {
        boost::mutex::scoped_lock lm (_mutex);
-
-       if (!_paused_job) {
-               return;
-       }
-
-       _paused_job->resume();
-       _paused_job.reset();
+       _paused = false;
+       _schedule_condition.notify_all();
 }