Emit the state of the job with the Finished signals.

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

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index ff5800aa84a6d2da70eed283eead48c9de6e2609..c8450bfdae152e3d4101ad0f1b3c063825e4cc55 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -24,6 +24,7 @@
  */
 
 
+#include "job.h"
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
@@ -32,7 +33,6 @@
 #include <list>
 
 
-class Job;
 class Film;
 class Playlist;
 class Content;
@@ -70,14 +70,14 @@ public:
                std::shared_ptr<const Playlist> playlist,
                bool from_zero,
                boost::signals2::connection& connection,
-               std::function<void()> ready
+               std::function<void (Job::Result)> ready
                );
 
        void analyse_subtitles (
                std::shared_ptr<const Film> film,
                std::shared_ptr<Content> content,
                boost::signals2::connection& connection,
-               std::function<void()> ready
+               std::function<void (Job::Result)> ready
                );
 
        boost::signals2::signal<void (std::weak_ptr<Job>)> JobAdded;
@@ -96,20 +96,20 @@ private:
        ~JobManager ();
        void scheduler ();
        void start ();
-       void priority_changed ();
        void job_finished ();
 
        mutable boost::mutex _mutex;
-       boost::condition _empty_condition;
+       boost::condition _schedule_condition;
        /** List of jobs in the order that they will be executed */
        std::list<std::shared_ptr<Job>> _jobs;
        std::list<boost::signals2::connection> _connections;
        bool _terminate = false;
-       bool _paused = false;
-       std::shared_ptr<Job> _paused_job;
 
        boost::optional<std::string> _last_active_job;
        boost::thread _scheduler;
 
+       /** true if all jobs should be paused */
+       bool _paused = false;
+
        static JobManager* _instance;
 };