Rename UISignaller -> SignalManager.

9 files changed, 16 insertions, 22 deletions

diff --git a/src/lib/content.cc b/src/lib/content.cc
index b00ea3e57..b9e8367e1 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -24,7 +24,6 @@
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
-#include "ui_signaller.h"
 #include "exceptions.h"
 #include "film.h"
 #include "safe_stringstream.h"
diff --git a/src/lib/job.cc b/src/lib/job.cc
index f28146632..c4d93ddc1 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -27,7 +27,6 @@
 #include "job.h"
 #include "util.h"
 #include "cross.h"
-#include "ui_signaller.h"
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 63db662d0..b5b64a77e 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -26,7 +26,6 @@
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
-#include "ui_signaller.h"
 
 using std::string;
 using std::list;
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 72a9a4ef5..b4b400b52 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -22,7 +22,6 @@
 #include "util.h"
 #include "config.h"
 #include "cross.h"
-#include "ui_signaller.h"
 #include "dcpomatic_socket.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
diff --git a/src/lib/ui_signaller.cc b/src/lib/signal_manager.cc
index 4cb34da51..7c2b3e11a 100644
--- a/src/lib/ui_signaller.cc
+++ b/src/lib/signal_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
 
 */
 
-#include "ui_signaller.h"
-
-/** Global UISignaller instance */
-UISignaller* ui_signaller = 0;
+#include "signal_manager.h"
 
+/** Global SignalManager instance */
+SignalManager* signal_manager = 0;
diff --git a/src/lib/ui_signaller.h b/src/lib/signal_manager.h
index 9d4495cd1..ae4306e30 100644
--- a/src/lib/ui_signaller.h
+++ b/src/lib/signal_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DCPOMATIC_UI_SIGNALLER_H
-#define DCPOMATIC_UI_SIGNALLER_H
+#ifndef DCPOMATIC_SIGNAL_MANAGER_H
+#define DCPOMATIC_SIGNAL_MANAGER_H
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
@@ -29,11 +29,11 @@ class Signaller;
 /** A class to allow signals to be emitted from non-UI threads and handled
  *  by a UI thread.
  */
-class UISignaller : public boost::noncopyable
+class SignalManager : public boost::noncopyable
 {
 public:
-	/** Create a UISignaller.  Must be called from the UI thread */
-	UISignaller ()
+	/** Create a SignalManager.  Must be called from the UI thread */
+	SignalManager ()
 		: _work (_service)
 	{
 		_ui_thread = boost::this_thread::get_id ();
@@ -53,7 +53,7 @@ public:
 
 	/** This should wake the UI and make it call ui_idle() */
 	virtual void wake_ui () {
-		/* This is only a sensible implementation when there is no GUI... */
+		/* This is only a sensible implementation when there is no GUI */
 		ui_idle ();
 	}
 
@@ -85,6 +85,6 @@ private:
 	boost::thread::id _ui_thread;
 };
 
-extern UISignaller* ui_signaller;
+extern SignalManager* signal_manager;
 
 #endif
diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index 408cfcf5b..4ef9b38b3 100644
--- a/src/lib/signaller.h
+++ b/src/lib/signaller.h
@@ -20,7 +20,7 @@
 #ifndef DCPOMATIC_SIGNALLER_H
 #define DCPOMATIC_SIGNALLER_H
 
-#include "ui_signaller.h"
+#include "signal_manager.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/signals2.hpp>
 
@@ -100,8 +100,8 @@ public:
 	void emit (T signal)
 	{
 		Wrapper<T>* w = new Wrapper<T> (signal);
-		if (ui_signaller) {
-			ui_signaller->emit (boost::bind (&Wrapper<T>::signal, w));
+		if (signal_manager) {
+			signal_manager->emit (boost::bind (&Wrapper<T>::signal, w));
 		}
 		
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/update.cc b/src/lib/update.cc
index 26944ecc3..f433ff991 100644
--- a/src/lib/update.cc
+++ b/src/lib/update.cc
@@ -19,7 +19,6 @@
 
 #include "update.h"
 #include "version.h"
-#include "ui_signaller.h"
 #include "safe_stringstream.h"
 #include "config.h"
 #include "util.h"
diff --git a/src/lib/wscript b/src/lib/wscript
index 68897a4c4..5956c73d6 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -109,7 +109,7 @@ sources = """
           transcode_job.cc
           transcoder.cc
           types.cc
-          ui_signaller.cc
+          signal_manager.cc
           update.cc
           upmixer_a.cc
           util.cc