X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.h;h=71db33fd6bf9d2b14fe8037ec1c56a5d7de1de67;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=461688845c53b2d0dcf767332eb5886d212168a7;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 461688845..71db33fd6 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,12 @@
 
 */
 
+
 /** @file  src/job_manager.h
  *  @brief A simple scheduler for jobs.
  */
 
+
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
@@ -29,23 +31,29 @@
 #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:
+	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;
+	std::list<std::shared_ptr<Job>> get () const;
 	bool work_to_do () const;
 	bool errors () const;
 	void increase_priority (std::shared_ptr<Job>);
@@ -62,14 +70,14 @@ public:
 		std::shared_ptr<const Playlist> playlist,
 		bool from_zero,
 		boost::signals2::connection& connection,
-		boost::function<void()> ready
+		std::function<void()> ready
 		);
 
 	void analyse_subtitles (
 		std::shared_ptr<const Film> film,
 		std::shared_ptr<Content> content,
 		boost::signals2::connection& connection,
-		boost::function<void()> ready
+		std::function<void()> ready
 		);
 
 	boost::signals2::signal<void (std::weak_ptr<Job>)> JobAdded;
@@ -88,16 +96,15 @@ private:
 	~JobManager ();
 	void scheduler ();
 	void start ();
-	void priority_changed ();
 	void job_finished ();
 
 	mutable boost::mutex _mutex;
 	boost::condition _empty_condition;
 	/** List of jobs in the order that they will be executed */
-	std::list<std::shared_ptr<Job> > _jobs;
+	std::list<std::shared_ptr<Job>> _jobs;
 	std::list<boost::signals2::connection> _connections;
-	bool _terminate;
-	bool _paused;
+	bool _terminate = false;
+	bool _paused = false;
 	std::shared_ptr<Job> _paused_job;
 
 	boost::optional<std::string> _last_active_job;