Changes to libdcp API.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index 9b8b14a93a2efc434b70297b9a2dbd51773e895a..f6120f1289458814d3569970a177ab5257a884b6 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -24,11 +24,11 @@
 #ifndef DCPOMATIC_JOB_H
 #define DCPOMATIC_JOB_H
 
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
+#include <string>
 
 class Film;
 
@@ -64,14 +64,17 @@ public:
 
        int elapsed_time () const;
        virtual std::string status () const;
+       std::string sub_name () const {
+               return _sub_name;
+       }
 
        void set_progress_unknown ();
-       void set_progress (float);
-       void ascend ();
-       void descend (float);
-       float overall_progress () const;
-       bool progress_unknown () const {
-               return _progress_unknown;
+       void set_progress (float, bool force = false);
+       void sub (std::string);
+       boost::optional<float> progress () const;
+
+       boost::shared_ptr<const Film> film () const {
+               return _film;
        }
 
        boost::signals2::signal<void()> Progress;
@@ -111,25 +114,18 @@ private:
        std::string _error_summary;
        std::string _error_details;
 
-       /** time that this job was started */
+       /** time that this sub-job was started */
        time_t _start_time;
+       std::string _sub_name;
 
-       /** mutex for _stack and _progress_unknown */
+       /** mutex for _progress */
        mutable boost::mutex _progress_mutex;
+       boost::optional<float> _progress;
 
-       struct Level {
-               Level (float a) : allocation (a), normalised (0) {}
-
-               float allocation;
-               float normalised;
-       };
-
-       std::list<Level> _stack;
-
-       /** true if this job's progress will always be unknown */
-       bool _progress_unknown;
-
-       float _last_set;
+       /** 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;
 };