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

diff --git a/src/lib/job.h b/src/lib/job.h
index a6777bc44..185273e2d 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -40,7 +40,7 @@ class Film;
 class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
 {
 public:
-	Job (boost::shared_ptr<const Film>);
+	Job (boost::shared_ptr<const Film> film);
 	virtual ~Job ();
 
 	/** @return user-readable name of this job */
@@ -50,7 +50,8 @@ public:
 	virtual void run () = 0;
 
 	void start ();
-	void pause ();
+	void pause_by_user ();
+	void pause_by_priority ();
 	void resume ();
 	void cancel ();
 
@@ -60,12 +61,12 @@ 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;
 	virtual std::string status () const;
 	std::string json_status () const;
 	std::string sub_name () const {
@@ -95,7 +96,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,6 +105,8 @@ protected:
 
 	void set_state (State);
 	void set_error (std::string s, std::string d);
+	int elapsed_sub_time () const;
+	void check_for_interruption_or_pause ();
 
 	boost::shared_ptr<const Film> _film;
 
@@ -121,13 +125,16 @@ private:
 	std::string _error_summary;
 	std::string _error_details;
 
-	/** 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.