X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob_manager.h;h=c8450bfdae152e3d4101ad0f1b3c063825e4cc55;hp=dd7a28db208914c3c67e06d09f04d5acd1c96595;hb=a6c4b4fa16d9c6597e362044b875f3d6df80753f;hpb=cef7a679a59044a5c807768042deecfd56ec6fc2

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index dd7a28db2..c8450bfda 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,13 @@
 
 */
 
+
 /** @file  src/job_manager.h
  *  @brief A simple scheduler for jobs.
  */
 
+
+#include "job.h"
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
@@ -29,27 +32,32 @@
 #include <boost/thread/condition.hpp>
 #include <list>
 
-class Job;
+
 class Film;
 class Playlist;
 class Content;
 struct threed_test7;
 
+
 extern bool wait_for_jobs ();
 
+
 /** @class JobManager
  *  @brief A simple scheduler for jobs.
  */
-class JobManager : public Signaller, public boost::noncopyable
+class JobManager : public Signaller
 {
 public:
-	boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
-	boost::shared_ptr<Job> add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
-	std::list<boost::shared_ptr<Job> > get () const;
+	JobManager (JobManager const&) = delete;
+	JobManager& operator= (JobManager const&) = delete;
+
+	std::shared_ptr<Job> add (std::shared_ptr<Job>);
+	std::shared_ptr<Job> add_after (std::shared_ptr<Job> after, std::shared_ptr<Job> j);
+	std::list<std::shared_ptr<Job>> get () const;
 	bool work_to_do () const;
 	bool errors () const;
-	void increase_priority (boost::shared_ptr<Job>);
-	void decrease_priority (boost::shared_ptr<Job>);
+	void increase_priority (std::shared_ptr<Job>);
+	void decrease_priority (std::shared_ptr<Job>);
 	void pause ();
 	void resume ();
 	bool paused () const {
@@ -58,21 +66,21 @@ public:
 	}
 
 	void analyse_audio (
-		boost::shared_ptr<const Film> film,
-		boost::shared_ptr<const Playlist> playlist,
+		std::shared_ptr<const Film> film,
+		std::shared_ptr<const Playlist> playlist,
 		bool from_zero,
 		boost::signals2::connection& connection,
-		boost::function<void()> ready
+		std::function<void (Job::Result)> ready
 		);
 
 	void analyse_subtitles (
-		boost::shared_ptr<const Film> film,
-		boost::shared_ptr<Content> content,
+		std::shared_ptr<const Film> film,
+		std::shared_ptr<Content> content,
 		boost::signals2::connection& connection,
-		boost::function<void()> ready
+		std::function<void (Job::Result)> ready
 		);
 
-	boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
+	boost::signals2::signal<void (std::weak_ptr<Job>)> JobAdded;
 	boost::signals2::signal<void ()> JobsReordered;
 	boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
 
@@ -88,20 +96,20 @@ private:
 	~JobManager ();
 	void scheduler ();
 	void start ();
-	void priority_changed ();
 	void job_finished ();
 
 	mutable boost::mutex _mutex;
-	boost::condition _empty_condition;
+	boost::condition _schedule_condition;
 	/** List of jobs in the order that they will be executed */
-	std::list<boost::shared_ptr<Job> > _jobs;
+	std::list<std::shared_ptr<Job>> _jobs;
 	std::list<boost::signals2::connection> _connections;
-	bool _terminate;
-	bool _paused;
-	boost::shared_ptr<Job> _paused_job;
+	bool _terminate = false;
 
 	boost::optional<std::string> _last_active_job;
 	boost::thread _scheduler;
 
+	/** true if all jobs should be paused */
+	bool _paused = false;
+
 	static JobManager* _instance;
 };