No-op: remove all trailing whitespace.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index 97e3fc29637d292597d943f4c9e70a77cdd8dfad..06a341f40d6808581d4bcf44ed3f2805f15285d1 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -24,18 +24,19 @@
 #ifndef DCPOMATIC_JOB_H
 #define DCPOMATIC_JOB_H
 
-#include <string>
+#include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
+#include <string>
 
 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;
        }
@@ -71,10 +74,7 @@ public:
        void set_progress_unknown ();
        void set_progress (float, bool force = false);
        void sub (std::string);
-       float progress () const;
-       bool progress_unknown () const {
-               return !_progress;
-       }
+       boost::optional<float> progress () const;
 
        boost::shared_ptr<const Film> film () const {
                return _film;
@@ -97,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);
 
@@ -125,6 +125,11 @@ private:
        mutable boost::mutex _progress_mutex;
        boost::optional<float> _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;
 };