Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 562c887de9b57479c75f702928ac2ae6aec5d313..a841fa60bd553698a873e7105d5f2086e8e4040b 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -26,13 +26,18 @@
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
+#include "ui_signaller.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::cout;
+using boost::shared_ptr;
+using boost::weak_ptr;
 
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
+       : _last_active_jobs (false)
 {
        boost::thread (boost::bind (&JobManager::scheduler, this));
 }
@@ -40,19 +45,16 @@ JobManager::JobManager ()
 shared_ptr<Job>
 JobManager::add (shared_ptr<Job> j)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       _jobs.push_back (j);
-       return j;
-}
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _jobs.push_back (j);
+       }
 
-void
-JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after);
-       assert (i != _jobs.end ());
-       ++i;
-       _jobs.insert (i, j);
+       if (ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+       }
+       
+       return j;
 }
 
 list<shared_ptr<Job> >
@@ -87,27 +89,43 @@ JobManager::errors () const
        return false;
 }      
 
-
 void
 JobManager::scheduler ()
 {
        while (1) {
+
+               bool active_jobs = false;
+
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
-                               if ((*i)->is_new()) {
-                                       shared_ptr<Job> r = (*i)->required ();
-                                       if (!r || r->finished_ok ()) {
-                                               (*i)->start ();
 
-                                               /* Only start one job at once */
-                                               break;
-                                       }
+                               if (!(*i)->finished ()) {
+                                       active_jobs = true;
                                }
+                               
+                               if ((*i)->running ()) {
+                                       /* Something is already happening */
+                                       break;
+                               }
+                               
+                               if ((*i)->is_new()) {
+                                       (*i)->start ();
+                                       
+                                       /* Only start one job at once */
+                                       break;
+                               }
+                       }
+               }
+
+               if (active_jobs != _last_active_jobs) {
+                       _last_active_jobs = active_jobs;
+                       if (ui_signaller) {
+                               ui_signaller->emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
                        }
                }
 
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
        }
 }