Make pause/resume work properly in the batch converter.

2 files changed, 14 insertions, 21 deletions

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 5504251b0..61087db72 100644
--- 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 ();
@@ -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();
 }
diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 7b48e79f2..435c250d1 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -62,7 +62,7 @@ public:
 	void resume ();
 	bool paused () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return static_cast<bool>(_paused_job);
+		return _paused;
 	}
 
 	void analyse_audio (
@@ -104,10 +104,12 @@ private:
 	std::list<std::shared_ptr<Job>> _jobs;
 	std::list<boost::signals2::connection> _connections;
 	bool _terminate = false;
-	std::shared_ptr<Job> _paused_job;
 
 	boost::optional<std::string> _last_active_job;
 	boost::thread _scheduler;
 
+	/** true if all jobs should be paused */
+	bool _paused = false;
+
 	static JobManager* _instance;
 };