pulling trunk

git-svn-id: svn://localhost/ardour2/branches/undo@586 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index f26828a114..78daa531dd 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include <sigc++/signal.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 #include <pbd/undo.h>
 #include <pbd/xml++.h>
 #include <ardour/ardour.h>
@@ -144,7 +144,7 @@ class AutomationList : public StateManager
 	std::pair<AutomationList::iterator,AutomationList::iterator> control_points_adjacent (double when);
 
 	template<class T> void apply_to_points (T& obj, void (T::*method)(const AutomationList&)) {
-		LockMonitor lm (lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm (lock);
 		(obj.*method)(*this);
 	}
 
@@ -157,13 +157,13 @@ class AutomationList : public StateManager
 	double get_max_xval() const { return max_xval; }
 
 	double eval (double where) {
-		LockMonitor lm (lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm (lock);
 		return unlocked_eval (where);
 	}
 
 	double rt_safe_eval (double where, bool& ok) {
 
-		TentativeLockMonitor lm (lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm (lock, Glib::TRY_LOCK);
 
 		if ((ok = lm.locked())) {
 			return unlocked_eval (where);
@@ -186,7 +186,7 @@ class AutomationList : public StateManager
 	};
 
 	AutomationEventList events;
-	mutable PBD::NonBlockingLock lock;
+	mutable Glib::Mutex lock;
 	bool   _frozen;
 	bool    changed_when_thawed;
 	bool   _dirty;