No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index d0dac7d19369073eda9761b2290b4e272056c786..70ac00b37bc4b86747639548601384a31059a0ec 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,16 +22,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,8 +46,15 @@ public:
        bool work_to_do () const;
        bool errors () const;
 
+       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 (bool)> ActiveJobsChanged;
+       boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
 
        static JobManager* instance ();
        static void drop ();
@@ -48,14 +62,18 @@ public:
 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;
 };