Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 7d58dcfe6d4464af6f669971f12f48dbbedfb870..560b5ca66c15d8ca9cf8c4840592a1a404bc8cff 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,16 +21,22 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <list>
+#include "signaller.h"
 #include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 #include <boost/signals2.hpp>
+#include <list>
 
 class Job;
+class Film;
+class Playlist;
+
+extern void wait_for_jobs ();
 
 /** @class JobManager
  *  @brief A simple scheduler for jobs.
  */
-class JobManager : public boost::noncopyable
+class JobManager : public Signaller, public boost::noncopyable
 {
 public:
 
@@ -39,21 +45,34 @@ public:
        bool work_to_do () const;
        bool errors () const;
 
-       boost::signals2::signal<void (bool)> ActiveJobsChanged;
+       void analyse_audio (
+               boost::shared_ptr<const Film> film,
+               boost::shared_ptr<const Playlist> playlist,
+               boost::signals2::connection& connection,
+               boost::function<void()> ready
+               );
+
+       boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
+       boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
 
        static JobManager* instance ();
+       static void drop ();
 
 private:
        /* This function is part of the test suite */
        friend void ::wait_for_jobs ();
-       
+
        JobManager ();
+       ~JobManager ();
        void scheduler ();
-       
+       void start ();
+
        mutable boost::mutex _mutex;
        std::list<boost::shared_ptr<Job> > _jobs;
+       bool _terminate;
 
-       bool _last_active_jobs;
+       boost::optional<std::string> _last_active_job;
+       boost::thread* _scheduler;
 
        static JobManager* _instance;
 };