Merged with trunk (painfully)

git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 8 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 8a707eb902..5699d9ef14 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -27,11 +27,8 @@
 #include <map>
 #include <string>
 
-#include <pthread.h>
-
-#include <pbd/atomic.h>
 #include <pbd/fastlog.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 #include <pbd/xml++.h>
 #include <pbd/undo.h>
 #include <midi++/controllable.h>
@@ -142,14 +139,14 @@ class Route : public IO
 	void flush_redirects ();
 
 	template<class T> void foreach_redirect (T *obj, void (T::*func)(Redirect *)) {
-		RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+		Glib::RWLock::ReaderLock lm (redirect_lock);
 		for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
 			(obj->*func) (*i);
 		}
 	}
 
 	Redirect *nth_redirect (uint32_t n) {
-		RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+		Glib::RWLock::ReaderLock lm (redirect_lock);
 		RedirectList::iterator i;
 		for (i = _redirects.begin(); i != _redirects.end() && n; ++i, --n);
 		if (i == _redirects.end()) {
@@ -294,9 +291,9 @@ class Route : public IO
 	jack_nframes_t           _roll_delay;
 	jack_nframes_t           _own_latency;
 	RedirectList             _redirects;
-	PBD::NonBlockingRWLock      redirect_lock;
+	Glib::RWLock      redirect_lock;
 	IO                      *_control_outs;
-	PBD::NonBlockingLock      control_outs_lock;
+	Glib::Mutex      control_outs_lock;
 	RouteGroup              *_edit_group;
 	RouteGroup              *_mix_group;
 	std::string              _comment;