projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove player activity logging. Fixes #2122.
[dcpomatic.git]
/
src
/
lib
/
signal_manager.h
diff --git
a/src/lib/signal_manager.h
b/src/lib/signal_manager.h
index 6ba4a94560b50cd79783a8b5d3e414c344f2f5fe..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,20
+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 "exception_store.h"
#include <boost/asio.hpp>
#include <boost/thread.hpp>
-#include <boost/noncopyable.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::noncopyable, public
ExceptionStore
+class SignalManager : public ExceptionStore
{
public:
/** Create a SignalManager. Must be called from the UI thread */
{
public:
/** Create a SignalManager. Must be called from the UI thread */
@@
-43,6
+46,9
@@
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) {
/* Do something next time the UI is idle */
template <typename T>
void when_idle (T f) {
@@
-95,6
+101,8
@@
private:
boost::thread::id _ui_thread;
};
boost::thread::id _ui_thread;
};
+
extern SignalManager* signal_manager;
extern SignalManager* signal_manager;
+
#endif
#endif