projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Undef SearchPath where needed as it is defined via windows.h
[ardour.git]
/
libs
/
pbd
/
pbd
/
signals.h
diff --git
a/libs/pbd/pbd/signals.h
b/libs/pbd/pbd/signals.h
index dc53b31f94422047a1865ce8d01626c6a8b8f81a..69c52f57cf9b330cf9ca76edf5e29c46ebeba720 100644
(file)
--- a/
libs/pbd/pbd/signals.h
+++ b/
libs/pbd/pbd/signals.h
@@
-21,13
+21,13
@@
#define __pbd_signals_h__
#include <list>
#define __pbd_signals_h__
#include <list>
-#include <glibmm/thread.h>
+#include <map>
+#include <glibmm/threads.h>
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp>
#include <boost/bind/protect.hpp>
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp>
#include <boost/bind/protect.hpp>
#include <boost/function.hpp>
-#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/optional.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/optional.hpp>
@@
-44,7
+44,7
@@
public:
virtual void disconnect (boost::shared_ptr<Connection>) = 0;
protected:
virtual void disconnect (boost::shared_ptr<Connection>) = 0;
protected:
-
boost::m
utex _mutex;
+
Glib::Threads::M
utex _mutex;
};
class Connection : public boost::enable_shared_from_this<Connection>
};
class Connection : public boost::enable_shared_from_this<Connection>
@@
-54,7
+54,7
@@
public:
void disconnect ()
{
void disconnect ()
{
-
boost::mutex::scoped_l
ock lm (_mutex);
+
Glib::Threads::Mutex::L
ock lm (_mutex);
if (_signal) {
_signal->disconnect (shared_from_this ());
_signal = 0;
if (_signal) {
_signal->disconnect (shared_from_this ());
_signal = 0;
@@
-63,12
+63,12
@@
public:
void signal_going_away ()
{
void signal_going_away ()
{
-
boost::mutex::scoped_l
ock lm (_mutex);
+
Glib::Threads::Mutex::L
ock lm (_mutex);
_signal = 0;
}
private:
_signal = 0;
}
private:
-
boost::m
utex _mutex;
+
Glib::Threads::M
utex _mutex;
SignalBase* _signal;
};
SignalBase* _signal;
};
@@
-147,7
+147,7
@@
class ScopedConnectionList : public boost::noncopyable
one from another.
*/
one from another.
*/
- Glib::Mutex _lock;
+ Glib::
Threads::
Mutex _lock;
typedef std::list<ScopedConnection*> ConnectionList;
ConnectionList _list;
typedef std::list<ScopedConnection*> ConnectionList;
ConnectionList _list;