projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: more variable renames.
[dcpomatic.git]
/
src
/
lib
/
signal_manager.h
diff --git
a/src/lib/signal_manager.h
b/src/lib/signal_manager.h
index b8d892c41dc264e527d094e6336c9ebd8697125b..99e3b5c52c271277a64fd654d121303eed877505 100644
(file)
--- a/
src/lib/signal_manager.h
+++ b/
src/lib/signal_manager.h
@@
-1,34
+1,40
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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.
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
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
#ifndef DCPOMATIC_SIGNAL_MANAGER_H
#define DCPOMATIC_SIGNAL_MANAGER_H
+
+#include "exception_store.h"
#include <boost/asio.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread.hpp>
+
class Signaller;
class Signaller;
+
/** A class to allow signals to be emitted from non-UI threads and handled
* by a UI thread.
*/
/** A class to allow signals to be emitted from non-UI threads and handled
* by a UI thread.
*/
-class SignalManager : public
boost::noncopyabl
e
+class SignalManager : public
ExceptionStor
e
{
public:
/** Create a SignalManager. Must be called from the UI thread */
{
public:
/** Create a SignalManager. Must be called from the UI thread */
@@
-38,16
+44,23
@@
public:
_ui_thread = boost::this_thread::get_id ();
}
_ui_thread = boost::this_thread::get_id ();
}
+ virtual ~SignalManager () {}
+
+ SignalManager (Signaller const&) = delete;
+ SignalManager& operator= (Signaller const&) = delete;
+
/* Do something next time the UI is idle */
template <typename T>
void when_idle (T f) {
_service.post (f);
}
/* Do something next time the UI is idle */
template <typename T>
void when_idle (T f) {
_service.post (f);
}
- /** Call this in the UI when it is idle */
+ /** Call this in the UI when it is idle.
+ * @return Number of idle handlers that were executed.
+ */
size_t ui_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() */
}
/** This should wake the UI and make it call ui_idle() */
@@
-66,7
+79,11
@@
private:
void emit (T f) {
if (boost::this_thread::get_id() == _ui_thread) {
/* already in the UI thread */
void emit (T f) {
if (boost::this_thread::get_id() == _ui_thread) {
/* already in the UI thread */
- f ();
+ try {
+ f ();
+ } catch (...) {
+ store_current ();
+ }
} else {
/* non-UI thread; post to the service and wake up the UI */
_service.post (f);
} else {
/* non-UI thread; post to the service and wake up the UI */
_service.post (f);
@@
-84,6
+101,8
@@
private:
boost::thread::id _ui_thread;
};
boost::thread::id _ui_thread;
};
+
extern SignalManager* signal_manager;
extern SignalManager* signal_manager;
+
#endif
#endif