X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flogmeter.h;h=a244fb4bbeab2a73be15cc603182e64505ea3f9f;hb=348c361f79c7dd3d2921201f97605d4935ad2b52;hp=c9addec8f5109e2c49433d83dd7981c869f42b58;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/gtk2_ardour/logmeter.h b/gtk2_ardour/logmeter.h
index c9addec8f5..a244fb4bbe 100644
--- a/gtk2_ardour/logmeter.h
+++ b/gtk2_ardour/logmeter.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 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
@@ -21,24 +21,34 @@
 #define __ardour_gtk_log_meter_h__
 
 #if 1
-inline float
+static inline float
 _log_meter (float power, double lower_db, double upper_db, double non_linearity)
 {
 	return (power < lower_db ? 0.0 : pow((power-lower_db)/(upper_db-lower_db), non_linearity));
 }
 
-inline float
+static inline float
 alt_log_meter (float power)
 {
 	return _log_meter (power, -192.0, 0.0, 8.0);
 }
 #endif
 
-inline float
+/* prototypes - avoid compiler warning */
+static inline float log_meter (float db);
+static inline float meter_deflect_ppm (float);
+static inline float meter_deflect_din (float);
+static inline float meter_deflect_nordic (float);
+static inline float meter_deflect_vu (float);
+static inline float meter_deflect_k (float, float);
+
+
+
+static inline float
 log_meter (float db)
 {
          gfloat def = 0.0f; /* Meter deflection %age */
- 
+
          if (db < -70.0f) {
                  def = 0.0f;
          } else if (db < -60.0f) {
@@ -56,8 +66,8 @@ log_meter (float db)
          } else {
 		 def = 115.0f;
 	 }
- 
-	 /* 115 is the deflection %age that would be 
+
+	 /* 115 is the deflection %age that would be
 	    when db=6.0. this is an arbitrary
 	    endpoint for our scaling.
 	 */
@@ -65,4 +75,71 @@ log_meter (float db)
          return def/115.0f;
 }
 
+static inline float
+meter_deflect_ppm (float db)
+{
+	if (db < -30) {
+		// 2.258 == ((-30 + 32.0)/ 28.0) / 10^(-30 / 20);
+		return (dB_to_coefficient(db) * 2.258769757f);
+	} else {
+		const float rv = (db + 32.0f) / 28.0f;
+		if (rv < 1.0) {
+			return rv;
+		} else {
+			return 1.0;
+		}
+	}
+}
+
+static inline float
+meter_deflect_din (float db)
+{
+	float rv = dB_to_coefficient(db);
+	rv = sqrtf (sqrtf (2.3676f * rv)) - 0.1803f;
+	if (rv >= 1.0) {
+		return 1.0;
+	} else {
+		return (rv > 0 ? rv : 0.0);
+	}
+}
+
+static inline float
+meter_deflect_nordic (float db)
+{
+	if (db < -60) {
+		return 0.0;
+	} else {
+		const float rv = (db + 60.0f) / 54.0f;
+		if (rv < 1.0) {
+			return rv;
+		} else {
+			return 1.0;
+		}
+	}
+}
+
+static inline float
+meter_deflect_vu (float db)
+{
+	const float rv = 6.77165f * dB_to_coefficient(db);
+	if (rv > 1.0) return 1.0;
+	return rv;
+}
+
+static inline float
+meter_deflect_k (float db, float krange)
+{
+	db+=krange;
+	if (db < -40.0f) {
+		return (dB_to_coefficient(db) * 500.0f / (krange + 45.0f));
+	} else {
+		const float rv = (db + 45.0f) / (krange + 45.0f);
+		if (rv < 1.0) {
+			return rv;
+		} else {
+			return 1.0;
+		}
+	}
+}
+
 #endif /* __ardour_gtk_log_meter_h__ */