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

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index e3f91f4fcf22dde2721e9c100d7e1a0e8c379dbf..08c744e0738a8faa4155d0bdf7ac083b8fcba134 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -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,23 +22,28 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <iostream>
-#include <boost/thread.hpp>
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
+#include "analyse_audio_job.h"
+#include "film.h"
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
+using boost::function;
+using boost::dynamic_pointer_cast;
+using boost::optional;
 
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
        : _terminate (false)
-       , _last_active_jobs (false)
        , _scheduler (0)
 {
 
@@ -57,6 +63,7 @@ JobManager::~JobManager ()
        }
 
        if (_scheduler) {
+               DCPOMATIC_ASSERT (_scheduler->joinable ());
                _scheduler->join ();
        }
 
@@ -113,7 +120,7 @@ JobManager::scheduler ()
 {
        while (true) {
 
-               bool active_jobs = false;
+               optional<string> active_job;
 
                {
                        boost::mutex::scoped_lock lm (_mutex);
@@ -121,29 +128,28 @@ JobManager::scheduler ()
                                return;
                        }
 
-                       for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
+                       BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
 
-                               if (!(*i)->finished ()) {
-                                       active_jobs = true;
+                               if (!i->finished ()) {
+                                       active_job = i->json_name ();
                                }
 
-                               if ((*i)->running ()) {
+                               if (i->running ()) {
                                        /* Something is already happening */
                                        break;
                                }
 
-                               if ((*i)->is_new()) {
-                                       (*i)->start ();
-
+                               if (i->is_new()) {
+                                       i->start ();
                                        /* Only start one job at once */
                                        break;
                                }
                        }
                }
 
-               if (active_jobs != _last_active_jobs) {
-                       _last_active_jobs = active_jobs;
-                       emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
+               if (active_job != _last_active_job) {
+                       emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
+                       _last_active_job = active_job;
                }
 
                dcpomatic_sleep (1);
@@ -167,3 +173,36 @@ JobManager::drop ()
        delete _instance;
        _instance = 0;
 }
+
+void
+JobManager::analyse_audio (
+       shared_ptr<const Film> film,
+       shared_ptr<const Playlist> playlist,
+       boost::signals2::connection& connection,
+       function<void()> ready
+       )
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+
+               BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+                       shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
+                       if (a && a->playlist () == playlist) {
+                               i->when_finished (connection, ready);
+                               return;
+                       }
+               }
+       }
+
+       shared_ptr<AnalyseAudioJob> job;
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+
+               job.reset (new AnalyseAudioJob (film, playlist));
+               connection = job->Finished.connect (ready);
+               _jobs.push_back (job);
+       }
+
+       emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
+}