No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index ae4306e3077ad51ed34f50b65da0bf8edcf461e1..13a45b640cede8a6d8930b0b70dcb43e56ba8031 100644 (file)
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -1,26 +1,26 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_SIGNAL_MANAGER_H
 #define DCPOMATIC_SIGNAL_MANAGER_H
 
-#include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 
@@ -39,6 +39,8 @@ public:
                _ui_thread = boost::this_thread::get_id ();
        }
 
+       virtual ~SignalManager () {}
+
        /* Do something next time the UI is idle */
        template <typename T>
        void when_idle (T f) {
@@ -47,8 +49,8 @@ public:
 
        /** Call this in the UI when it is idle */
        size_t ui_idle () {
-               /* This executes any functors that have been post()ed to _service */
-               return _service.poll ();
+               /* This executes one of the functors that has been post()ed to _service */
+               return _service.poll_one ();
        }
 
        /** This should wake the UI and make it call ui_idle() */
@@ -76,7 +78,7 @@ private:
        }
 
        friend class Signaller;
-       
+
        /** A io_service which is used as the conduit for messages */
        boost::asio::io_service _service;
        /** Object required to keep io_service from stopping when it has nothing to do */