projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo preventing audio sync fixes when audio follows video.
[dcpomatic.git]
/
src
/
lib
/
job_manager.cc
diff --git
a/src/lib/job_manager.cc
b/src/lib/job_manager.cc
index 2db91a177cc08c194644e7b35efc7095e577cddd..9105976280dd3b7d5ab58f81a362bdb72dcf5a9d 100644
(file)
--- a/
src/lib/job_manager.cc
+++ b/
src/lib/job_manager.cc
@@
-26,13
+26,16
@@
#include "job_manager.h"
#include "job.h"
#include "cross.h"
#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 boost::shared_ptr;
JobManager* JobManager::_instance = 0;
JobManager::JobManager ()
JobManager* JobManager::_instance = 0;
JobManager::JobManager ()
+ : _last_active_jobs (false)
{
boost::thread (boost::bind (&JobManager::scheduler, this));
}
{
boost::thread (boost::bind (&JobManager::scheduler, this));
}
@@
-87,31
+90,42
@@
JobManager::errors () const
return false;
}
return false;
}
-
void
JobManager::scheduler ()
{
while (1) {
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) {
{
boost::mutex::scoped_lock lm (_mutex);
for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
+
+ if (!(*i)->finished ()) {
+ active_jobs = true;
+ }
+
if ((*i)->running ()) {
/* Something is already happening */
break;
}
if ((*i)->is_new()) {
if ((*i)->running ()) {
/* Something is already happening */
break;
}
if ((*i)->is_new()) {
- shared_ptr<Job> r = (*i)->required ();
- if (!r || r->finished_ok ()) {
- (*i)->start ();
-
- /* Only start one job at once */
- break;
- }
+ (*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);
}
}
dvdomatic_sleep (1);
}
}