Fix the build for older macOS.

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

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 560b5ca66c15d8ca9cf8c4840592a1a404bc8cff..ff5800aa84a6d2da70eed283eead48c9de6e2609 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -1,58 +1,87 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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/>.
 
 */
 
+
 /** @file  src/job_manager.h
  *  @brief A simple scheduler for jobs.
  */
 
+
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
 #include <list>
 
+
 class Job;
 class Film;
 class Playlist;
+class Content;
+struct threed_test7;
+
+
+extern bool wait_for_jobs ();
 
-extern void wait_for_jobs ();
 
 /** @class JobManager
  *  @brief A simple scheduler for jobs.
  */
-class JobManager : public Signaller, public boost::noncopyable
+class JobManager : public Signaller
 {
 public:
+       JobManager (JobManager const&) = delete;
+       JobManager& operator= (JobManager const&) = delete;
 
-       boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
-       std::list<boost::shared_ptr<Job> > get () const;
+       std::shared_ptr<Job> add (std::shared_ptr<Job>);
+       std::shared_ptr<Job> add_after (std::shared_ptr<Job> after, std::shared_ptr<Job> j);
+       std::list<std::shared_ptr<Job>> get () const;
        bool work_to_do () const;
        bool errors () const;
+       void increase_priority (std::shared_ptr<Job>);
+       void decrease_priority (std::shared_ptr<Job>);
+       void pause ();
+       void resume ();
+       bool paused () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _paused;
+       }
 
        void analyse_audio (
-               boost::shared_ptr<const Film> film,
-               boost::shared_ptr<const Playlist> playlist,
+               std::shared_ptr<const Film> film,
+               std::shared_ptr<const Playlist> playlist,
+               bool from_zero,
+               boost::signals2::connection& connection,
+               std::function<void()> ready
+               );
+
+       void analyse_subtitles (
+               std::shared_ptr<const Film> film,
+               std::shared_ptr<Content> content,
                boost::signals2::connection& connection,
-               boost::function<void()> ready
+               std::function<void()> ready
                );
 
-       boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
+       boost::signals2::signal<void (std::weak_ptr<Job>)> JobAdded;
+       boost::signals2::signal<void ()> JobsReordered;
        boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
 
        static JobManager* instance ();
@@ -60,19 +89,27 @@ public:
 
 private:
        /* This function is part of the test suite */
-       friend void ::wait_for_jobs ();
+       friend bool ::wait_for_jobs ();
+       friend struct threed_test7;
 
        JobManager ();
        ~JobManager ();
        void scheduler ();
        void start ();
+       void priority_changed ();
+       void job_finished ();
 
        mutable boost::mutex _mutex;
-       std::list<boost::shared_ptr<Job> > _jobs;
-       bool _terminate;
+       boost::condition _empty_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;
+       boost::thread _scheduler;
 
        static JobManager* _instance;
 };