X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flogcurve.h;h=4c91ad9a792952fbbe3a7ce0083ea87276f93a62;hb=91e0e0f9f83496fd5ec8f40844ba02df61de37f4;hp=e65be55772027addf2ef2ed0747b187b743a3178;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git

diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h
index e65be55772..4c91ad9a79 100644
--- a/libs/ardour/ardour/logcurve.h
+++ b/libs/ardour/ardour/logcurve.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Steve Harris & Paul Davis 
+    Copyright (C) 2001 Steve Harris & Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,14 +15,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_logcurve_h__
 #define __ardour_logcurve_h__
 
-#include <pbd/fastlog.h>
-#include <glibmm/thread.h>
+#include "pbd/fastlog.h"
+#include <glibmm/threads.h>
 
 namespace ARDOUR {
 
@@ -42,22 +41,22 @@ class LogCurve {
 	bool operator!= (const LogCurve& other) const {
 		return S != other.S || l != other.l;
 	}
-	
+
 	float value (float frac) const {
 		return (fast_log(frac + S) - a) * b;
-	} 
-	
+	}
+
 	float value (uint32_t pos) const {
 		return (fast_log(((float) pos/l) + S) - a) * b;
-	} 
+	}
 
 	float invert_value (float frac) const {
 		return (a - fast_log(frac + S)) * b;
-	} 
-	
+	}
+
 	float invert_value (uint32_t pos) const {
 		return (a - fast_log(((float) pos/l) + S)) * b;
-	} 
+	}
 
 	void fill (float *vec, uint32_t veclen, bool invert) const {
 		float dx = 1.0f/veclen;
@@ -86,15 +85,15 @@ class LogCurve {
 
 	float steepness() const { return S; }
 	uint32_t length() const { return l; }
-	
-	void set_steepness (float steepness) { 
-		S = steepness; 
-		a = log(S); 		
+
+	void set_steepness (float steepness) {
+		S = steepness;
+		a = log(S);
 		b = 1.0f / log(1.0f + (1.0f / S));
 	}
 	void set_length (uint32_t len) { l = len; }
 
-	mutable Glib::Mutex lock;
+	mutable Glib::Threads::Mutex lock;
 
   protected:
 	float a;
@@ -103,30 +102,30 @@ class LogCurve {
 	uint32_t l;
 };
 
-class LogCurveIn : public LogCurve 
+class LogCurveIn : public LogCurve
 {
   public:
-	LogCurveIn (float steepness = 0.2, uint32_t len = 0) 
+	LogCurveIn (float steepness = 0.2, uint32_t len = 0)
 		: LogCurve (steepness, len) {}
 
 	float value (float frac) const {
 		return (fast_log(frac + S) - a) * b;
-	} 
-	
+	}
+
 	float value (uint32_t pos) const {
 		return (fast_log(((float) pos/l) + S) - a) * b;
-	} 
+	}
 };
 
-class LogCurveOut : public LogCurve 
+class LogCurveOut : public LogCurve
 {
   public:
-	LogCurveOut (float steepness = 0.2, uint32_t len = 0) 
+	LogCurveOut (float steepness = 0.2, uint32_t len = 0)
 		: LogCurve (steepness, len) {}
 
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_logcurve_h__ */