Add a load of explicit keywords.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index 7bc051142c5507802d022c479c03befadd22b911..e5552e49ea8f63acec13443fccf29cc3d6f6b7a9 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,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,8 +125,10 @@ 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 and _last_progress_update */