{
boost::mutex::scoped_lock lm (_mutex);
_terminate = true;
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all();
}
try {
{
boost::mutex::scoped_lock lm (_mutex);
_jobs.push_back (j);
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all();
}
emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(j)));
auto i = find (_jobs.begin(), _jobs.end(), after);
DCPOMATIC_ASSERT (i != _jobs.end());
_jobs.insert (i, j);
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all();
}
emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(j)));
bool have_running = false;
for (auto i: _jobs) {
- if (have_running && i->running()) {
+ if ((have_running || _paused) && i->running()) {
+ /* We already have a running job, or are totally paused, so this job should not be running */
i->pause_by_priority();
- } else if (!have_running && (i->is_new() || i->paused_by_priority())) {
+ } else if (!have_running && !_paused && (i->is_new() || i->paused_by_priority())) {
+ /* We don't have a running job, and we should have one, so start/resume this */
if (i->is_new()) {
_connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
i->start ();
}
}
- _empty_condition.wait (lm);
+ _schedule_condition.wait(lm);
}
}
_last_active_job = optional<string>();
}
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all();
}
job = make_shared<AnalyseAudioJob> (film, playlist, from_zero);
connection = job->Finished.connect (ready);
_jobs.push_back (job);
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all ();
}
emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
job = make_shared<AnalyseSubtitlesJob>(film, content);
connection = job->Finished.connect (ready);
_jobs.push_back (job);
- _empty_condition.notify_all ();
+ _schedule_condition.notify_all ();
}
emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(job)));
swap(*iter, *std::prev(iter));
}
- _empty_condition.notify_all();
+ _schedule_condition.notify_all();
emit(boost::bind(boost::ref(JobsReordered)));
}
swap(*iter, *std::next(iter));
}
- _empty_condition.notify_all();
+ _schedule_condition.notify_all();
emit(boost::bind(boost::ref(JobsReordered)));
}
+/** Pause all job processing */
void
JobManager::pause ()
{
boost::mutex::scoped_lock lm (_mutex);
-
- if (_paused) {
- return;
- }
-
- for (auto i: _jobs) {
- if (i->pause_by_user()) {
- _paused_job = i;
- }
- }
-
_paused = true;
+ _schedule_condition.notify_all();
}
+/** Resume processing jobs after a previous pause() */
void
JobManager::resume ()
{
boost::mutex::scoped_lock lm (_mutex);
- if (!_paused) {
- return;
- }
-
- if (_paused_job) {
- _paused_job->resume ();
- }
-
- _paused_job.reset ();
_paused = false;
+ _schedule_condition.notify_all();
}