Destory TranscodeJob earlier, hopefully to fix #1570.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index 311f9cc9104045ef434ed52c5dee7d69459bb7e9..cb85059a61875c470a5a750d225fe51930dd7ee2 100644 (file)
--- 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>);
+       explicit Job (boost::shared_ptr<const Film> film);
        virtual ~Job ();
 
        /** @return user-readable name of this job */
@@ -50,7 +50,7 @@ public:
        virtual void run () = 0;
 
        void start ();
-       void pause_by_user ();
+       bool pause_by_user ();
        void pause_by_priority ();
        void resume ();
        void cancel ();
@@ -67,6 +67,8 @@ public:
        std::string error_summary () const;
        std::string error_details () const;
 
+       boost::optional<std::string> message () const;
+
        virtual std::string status () const;
        std::string json_status () const;
        std::string sub_name () const {
@@ -87,6 +89,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:
 
@@ -105,8 +109,10 @@ 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;
 
@@ -117,13 +123,15 @@ private:
 
        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 job was started */
        time_t _start_time;