X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.h;h=d047913a0a750f9f82c57ee65a3dcdd86497732b;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=a6777bc449e4a805c3db74d72c6c9d25938bba8e;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/job.h b/src/lib/job.h
index a6777bc44..d047913a0 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -27,7 +27,6 @@
 
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <string>
@@ -37,10 +36,10 @@ class Film;
 /** @class Job
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
-class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
+class Job : public std::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
 {
 public:
-	Job (boost::shared_ptr<const Film>);
+	explicit Job (std::shared_ptr<const Film> film);
 	virtual ~Job ();
 
 	/** @return user-readable name of this job */
@@ -50,7 +49,8 @@ public:
 	virtual void run () = 0;
 
 	void start ();
-	void pause ();
+	bool pause_by_user ();
+	void pause_by_priority ();
 	void resume ();
 	void cancel ();
 
@@ -60,12 +60,14 @@ public:
 	bool finished_ok () const;
 	bool finished_in_error () const;
 	bool finished_cancelled () const;
-	bool paused () const;
+	bool paused_by_user () const;
+	bool paused_by_priority () const;
 
 	std::string error_summary () const;
 	std::string error_details () const;
 
-	int elapsed_time () const;
+	boost::optional<std::string> message () const;
+
 	virtual std::string status () const;
 	std::string json_status () const;
 	std::string sub_name () const {
@@ -77,7 +79,7 @@ public:
 	void sub (std::string);
 	boost::optional<float> progress () const;
 
-	boost::shared_ptr<const Film> film () const {
+	std::shared_ptr<const Film> film () const {
 		return _film;
 	}
 
@@ -86,6 +88,8 @@ public:
 	boost::signals2::signal<void()> Progress;
 	/** Emitted from the UI thread when the job is finished */
 	boost::signals2::signal<void()> Finished;
+	/** Emitted from the job thread when the job is finished */
+	boost::signals2::signal<void()> FinishedImmediate;
 
 protected:
 
@@ -95,7 +99,8 @@ protected:
 	enum State {
 		NEW,		///< the job hasn't been started yet
 		RUNNING,	///< the job is running
-		PAUSED,		///< the job has been paused
+		PAUSED_BY_USER,	///< the job has been paused
+		PAUSED_BY_PRIORITY, ///< the job has been paused
 		FINISHED_OK,	///< the job has finished successfully
 		FINISHED_ERROR, ///< the job has finished in error
 		FINISHED_CANCELLED ///< the job was cancelled
@@ -103,31 +108,40 @@ protected:
 
 	void set_state (State);
 	void set_error (std::string s, std::string d);
+	void set_message (std::string m);
+	int elapsed_sub_time () const;
+	void check_for_interruption_or_pause ();
+	void stop_thread ();
 
-	boost::shared_ptr<const Film> _film;
+	std::shared_ptr<const Film> _film;
 
 private:
 
 	void run_wrapper ();
 	void set_progress_common (boost::optional<float> p);
 
-	boost::thread* _thread;
+	boost::thread _thread;
 
-	/** mutex for _state and _error */
+	/** mutex for _state, _error*, _message */
 	mutable boost::mutex _state_mutex;
 	/** current state of the job */
 	State _state;
 	/** summary of an error that has occurred (when state == FINISHED_ERROR) */
 	std::string _error_summary;
 	std::string _error_details;
+	/** a message that should be given to the user when the job finishes */
+	boost::optional<std::string> _message;
 
-	/** time that this sub-job was started */
+	/** time that this job was started */
 	time_t _start_time;
+	/** time that this sub-job was started */
+	time_t _sub_start_time;
 	std::string _sub_name;
 
-	/** mutex for _progress */
+	/** mutex for _progress and _last_progress_update */
 	mutable boost::mutex _progress_mutex;
 	boost::optional<float> _progress;
+	boost::optional<struct timeval> _last_progress_update;
 
 	/** condition to signal changes to pause/resume so that we know when to wake;
 	    this could be a general _state_change if it made more sense.