Merge master.

[dcpomatic.git] / src / lib / ui_signaller.h

diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 0d19660bfd8847b2d6c999b1249ca5e69d0800dc..1d62547f61f79f5019f506b3a5b81712bc49167b 100644 (file)
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_UI_SIGNALLER_H
-#define DVDOMATIC_UI_SIGNALLER_H
+#ifndef DCPOMATIC_UI_SIGNALLER_H
+#define DCPOMATIC_UI_SIGNALLER_H
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
@@ -27,7 +27,7 @@
 /** A class to allow signals to be emitted from non-UI threads and handled
  *  by a UI thread.
  */
-class UISignaller
+class UISignaller : public boost::noncopyable
 {
 public:
        /** Create a UISignaller.  Must be called from the UI thread */
@@ -55,8 +55,8 @@ public:
        }
 
        /** Call this in the UI when it is idle */
-       void ui_idle () {
-               _service.poll ();
+       size_t ui_idle () {
+               return _service.poll ();
        }
 
        /** This should wake the UI and make it call ui_idle() */