projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated es_ES translation from Manuel AC.
[dcpomatic.git]
/
src
/
lib
/
signal_manager.h
diff --git
a/src/lib/signal_manager.h
b/src/lib/signal_manager.h
index 13a45b640cede8a6d8930b0b70dcb43e56ba8031..99e3b5c52c271277a64fd654d121303eed877505 100644
(file)
--- a/
src/lib/signal_manager.h
+++ b/
src/lib/signal_manager.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,18
+18,23
@@
*/
*/
+
#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 */
@@
-41,13
+46,18
@@
public:
virtual ~SignalManager () {}
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 () {
/* This executes one of the functors that has been post()ed to _service */
return _service.poll_one ();
size_t ui_idle () {
/* This executes one of the functors that has been post()ed to _service */
return _service.poll_one ();
@@
-69,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);
@@
-87,6
+101,8
@@
private:
boost::thread::id _ui_thread;
};
boost::thread::id _ui_thread;
};
+
extern SignalManager* signal_manager;
extern SignalManager* signal_manager;
+
#endif
#endif