Merge branch 'master' into content-rework-take5

[dcpomatic.git] / src / lib / job.h

diff --git a/src/lib/job.h b/src/lib/job.h
index c98dbaea15dfb13133611f61727439d332158470..f5175c525024ee6b4636e73c35f24e58cbc6a06f 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -28,6 +28,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
 
 class Film;
 
@@ -37,7 +38,7 @@ class Film;
 class Job : public boost::enable_shared_from_this<Job>
 {
 public:
-       Job (boost::shared_ptr<Film> s);
+       Job (boost::shared_ptr<Film>);
        virtual ~Job() {}
 
        /** @return user-readable name of this job */
@@ -46,12 +47,14 @@ public:
        virtual void run () = 0;
        
        void start ();
+       void cancel ();
 
        bool is_new () const;
        bool running () const;
        bool finished () const;
        bool finished_ok () const;
        bool finished_in_error () const;
+       bool finished_cancelled () const;
 
        std::string error_summary () const;
        std::string error_details () const;
@@ -74,22 +77,24 @@ protected:
 
        /** Description of a job's state */
        enum State {
-               NEW,           ///< the job hasn't been started yet
-               RUNNING,       ///< the job is running
-               FINISHED_OK,   ///< the job has finished successfully
-               FINISHED_ERROR ///< the job has finished in error
+               NEW,            ///< the job hasn't been started yet
+               RUNNING,        ///< the job is running
+               FINISHED_OK,    ///< the job has finished successfully
+               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);
 
-       /** Film for this job */
        boost::shared_ptr<Film> _film;
 
 private:
 
        void run_wrapper ();
 
+       boost::thread* _thread;
+
        /** mutex for _state and _error */
        mutable boost::mutex _state_mutex;
        /** current state of the job */