From 69812a7d02f5714a80a0a131b96f5f76a8f3c3a3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Jul 2013 23:57:23 +0100
Subject: Remove polling from JobManagerView and use signals instead (fixes
 #137).

---
 src/lib/job.cc         |  4 ++++
 src/lib/job.h          |  1 +
 src/lib/job_manager.cc | 12 ++++++++++--
 src/lib/job_manager.h  |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 5d8a68ec0..18df40878 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -215,6 +215,10 @@ Job::set_progress (float p)
 	if (paused ()) {
 		dcpomatic_sleep (1);
 	}
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Progress)));
+	}
 }
 
 /** @return fractional overall progress, or -1 if not known */
diff --git a/src/lib/job.h b/src/lib/job.h
index 716b0c5c6..343d40095 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -71,6 +71,7 @@ public:
 	void descend (float);
 	float overall_progress () const;
 
+	boost::signals2::signal<void()> Progress;
 	/** Emitted from the UI thread when the job is finished */
 	boost::signals2::signal<void()> Finished;
 
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 2d216dacb..95961c3fc 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -31,6 +31,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 
 JobManager* JobManager::_instance = 0;
 
@@ -43,8 +44,15 @@ JobManager::JobManager ()
 shared_ptr<Job>
 JobManager::add (shared_ptr<Job> j)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_jobs.push_back (j);
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_jobs.push_back (j);
+	}
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+	}
+	
 	return j;
 }
 
diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 7d58dcfe6..0040568c6 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -39,6 +39,7 @@ public:
 	bool work_to_do () const;
 	bool errors () const;
 
+	boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
 	boost::signals2::signal<void (bool)> ActiveJobsChanged;
 
 	static JobManager* instance ();
-- 
cgit v1.2.3