X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.h;h=7814e0c2d75452f84912854df972a29162a9e548;hb=bb3a9a12116a4b2a5bc1fef38e73853f576a773a;hp=8b89fd0c383fbbb41c4bb76183588b2a583b08b0;hpb=03f138ee007efd175c85d7c63f8deec567065d89;p=dcpomatic.git

diff --git a/src/lib/job.h b/src/lib/job.h
index 8b89fd0c3..7814e0c2d 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -91,13 +91,21 @@ public:
 		return _film;
 	}
 
-	void when_finished (boost::signals2::connection& connection, std::function<void()> finished);
+	enum class Result {
+		RESULT_OK,
+		RESULT_ERROR,     // we can't have plain ERROR on Windows
+		RESULT_CANCELLED
+	};
+
+	void when_finished(boost::signals2::connection& connection, std::function<void(Result)> finished);
+
+	void set_rate_limit_progress(bool rate_limit);
 
 	boost::signals2::signal<void()> Progress;
 	/** Emitted from the UI thread when the job is finished */
-	boost::signals2::signal<void()> Finished;
+	boost::signals2::signal<void (Result)> Finished;
 	/** Emitted from the job thread when the job is finished */
-	boost::signals2::signal<void()> FinishedImmediate;
+	boost::signals2::signal<void (Result)> FinishedImmediate;
 
 protected:
 
@@ -114,8 +122,9 @@ protected:
 		FINISHED_CANCELLED ///< the job was cancelled
 	};
 
+	Result state_to_result(State state) const;
 	void set_state (State);
-	void set_error (std::string s, std::string d);
+	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 ();
@@ -123,6 +132,9 @@ protected:
 
 	std::shared_ptr<const Film> _film;
 
+	time_t _start_time = 0;
+	time_t _finish_time = 0;
+
 private:
 
 	void run_wrapper ();
@@ -140,8 +152,6 @@ private:
 	/** a message that should be given to the user when the job finishes */
 	boost::optional<std::string> _message;
 
-	/** 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;
@@ -151,12 +161,15 @@ private:
 	boost::optional<float> _progress;
 	boost::optional<struct timeval> _last_progress_update;
 
+	/** true to limit emissions of the progress signal so that they don't
+	 *  come too often.
+	 */
+	boost::atomic<bool> _rate_limit_progress;
+
 	/** 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.
 	*/
 	boost::condition_variable _pause_changed;
-
-	int _ran_for;
 };
 
 #endif