X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.h;h=06a341f40d6808581d4bcf44ed3f2805f15285d1;hb=99428af22969a6cfb1dbd2053a9356bb23b3182f;hp=f6120f1289458814d3569970a177ab5257a884b6;hpb=68f662ac50a00ad986e3bd258c3f7daac374ab26;p=dcpomatic.git

diff --git a/src/lib/job.h b/src/lib/job.h
index f6120f128..06a341f40 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -24,6 +24,7 @@
 #ifndef DCPOMATIC_JOB_H
 #define DCPOMATIC_JOB_H
 
+#include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
@@ -35,7 +36,7 @@ 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 boost::noncopyable
+class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
 {
 public:
 	Job (boost::shared_ptr<const Film>);
@@ -43,9 +44,10 @@ public:
 
 	/** @return user-readable name of this job */
 	virtual std::string name () const = 0;
+	virtual std::string json_name () const = 0;
 	/** Run this job in the current thread. */
 	virtual void run () = 0;
-	
+
 	void start ();
 	void pause ();
 	void resume ();
@@ -64,6 +66,7 @@ public:
 
 	int elapsed_time () const;
 	virtual std::string status () const;
+	std::string json_status () const;
 	std::string sub_name () const {
 		return _sub_name;
 	}
@@ -94,7 +97,7 @@ protected:
 		FINISHED_ERROR, ///< the job has finished in error
 		FINISHED_CANCELLED ///< the job was cancelled
 	};
-	
+
 	void set_state (State);
 	void set_error (std::string s, std::string d);