Fixed i18n system.

[ardour.git] / libs / ardour / curve.cc

diff --git a/libs/ardour/curve.cc b/libs/ardour/curve.cc
index 613222020c74dfb35c57e7cbac7be4ed9f997847..977b6dfd7be5088fc88df669e594497e57564a71 100644 (file)
--- a/libs/ardour/curve.cc
+++ b/libs/ardour/curve.cc
@@ -28,7 +28,7 @@
 #include <cfloat>
 #include <cmath>
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 #include <sigc++/bind.h>
 
 #include "ardour/curve.h"
@@ -37,8 +37,8 @@
 
 using namespace std;
 using namespace ARDOUR;
-using namespace PBD;
 using namespace sigc;
+using namespace PBD;
 
 Curve::Curve (double minv, double maxv, double canv, bool nostate)
        : AutomationList (canv, nostate)
@@ -204,7 +204,7 @@ Curve::solve ()
 bool
 Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
 {
-       TentativeLockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock, Glib::TRY_LOCK);
 
        if (!lm.locked()) {
                return false;
@@ -217,7 +217,7 @@ Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
 void
 Curve::get_vector (double x0, double x1, float *vec, int32_t veclen)
 {
-       LockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock);
        _get_vector (x0, x1, vec, veclen);
 }