#ifndef DCPOMATIC_SIGNALLER_H
#define DCPOMATIC_SIGNALLER_H
-#include "ui_signaller.h"
+#include "signal_manager.h"
#include <boost/thread/mutex.hpp>
-#include <boost/signals2.hpp>
class WrapperBase
{
public:
/* Can be called from any thread */
virtual ~Signaller () {
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_signaller_mutex);
for (std::list<WrapperBase*>::iterator i = _wrappers.begin(); i != _wrappers.end(); ++i) {
(*i)->invalidate ();
}
void emit (T signal)
{
Wrapper<T>* w = new Wrapper<T> (signal);
- if (ui_signaller) {
- ui_signaller->emit (boost::bind (&Wrapper<T>::signal, w));
+ if (signal_manager) {
+ signal_manager->emit (boost::bind (&Wrapper<T>::signal, w));
}
-
- boost::mutex::scoped_lock lm (_mutex);
+
+ boost::mutex::scoped_lock lm (_signaller_mutex);
/* Clean up finished Wrappers */
std::list<WrapperBase*>::iterator i = _wrappers.begin ();
private:
/* Protect _wrappers */
- boost::mutex _mutex;
+ boost::mutex _signaller_mutex;
std::list<WrapperBase*> _wrappers;
};