{
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)));
}
}
- _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)));
}
{
boost::mutex::scoped_lock lm (_mutex);
- if (_paused) {
+ if (_paused_job) {
return;
}
_paused_job = i;
}
}
-
- _paused = true;
}
JobManager::resume ()
{
boost::mutex::scoped_lock lm (_mutex);
- if (!_paused) {
- return;
- }
- if (_paused_job) {
- _paused_job->resume ();
+ if (!_paused_job) {
+ return;
}
- _paused_job.reset ();
- _paused = false;
+ _paused_job->resume();
+ _paused_job.reset();
}