From 7a5ccdd3c32724babc7a819c7ffbfe3d5eb991aa Mon Sep 17 00:00:00 2001
From: Todd Naugle <toddn@harrisonconsoles.com>
Date: Fri, 2 Jul 2021 15:56:11 -0500
Subject: [PATCH] Mackie Control Surface: Move meter deflection calc to a
 function.

---
 libs/surfaces/mackie/meter.cc | 62 ++++++++++++++++++++---------------
 libs/surfaces/mackie/meter.h  |  1 +
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/libs/surfaces/mackie/meter.cc b/libs/surfaces/mackie/meter.cc
index cc4ac32fff..2c2caefcf4 100644
--- a/libs/surfaces/mackie/meter.cc
+++ b/libs/surfaces/mackie/meter.cc
@@ -69,9 +69,41 @@ Meter::notify_metering_state_changed(Surface& surface, bool transport_is_rolling
 void
 Meter::send_update (Surface& surface, float dB)
 {
-	float def = 0.0f; /* Meter deflection %age */
+	std::pair<bool,float> result = calculate_meter_over_and_deflection(dB);
 
-	// DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Meter ID %1 dB %2\n", id(), dB));
+	MidiByteArray msg;
+
+	if (result.first) {
+		if (!overload_on) {
+			overload_on = true;
+			surface.write (MidiByteArray (2, 0xd0, (id() << 4) | 0xe));
+
+		}
+	} else {
+		if (overload_on) {
+			overload_on = false;
+			surface.write (MidiByteArray (2, 0xd0, (id() << 4) | 0xf));
+		}
+	}
+
+	/* we can use up to 13 segments */
+
+	int segment = lrintf ((result.second/115.0) * 13.0);
+
+	surface.write (MidiByteArray (2, 0xd0, (id()<<4) | segment));
+}
+
+MidiByteArray
+Meter::zero ()
+{
+	return MidiByteArray (2, 0xD0, (id()<<4 | 0));
+}
+
+std::pair<bool, float>
+Meter::calculate_meter_over_and_deflection (float dB) 
+{
+	float def = 0.0f; /* Meter deflection %age */
+	bool over = false;
 
 	if (dB < -70.0f) {
 		def = 0.0f;
@@ -96,30 +128,8 @@ Meter::send_update (Surface& surface, float dB)
 	   endpoint for our scaling.
 	*/
 
-	MidiByteArray msg;
-
 	if (def > 100.0f) {
-		if (!overload_on) {
-			overload_on = true;
-			surface.write (MidiByteArray (2, 0xd0, (id() << 4) | 0xe));
-
-		}
-	} else {
-		if (overload_on) {
-			overload_on = false;
-			surface.write (MidiByteArray (2, 0xd0, (id() << 4) | 0xf));
-		}
+			over = true;
 	}
-
-	/* we can use up to 13 segments */
-
-	int segment = lrintf ((def/115.0) * 13.0);
-
-	surface.write (MidiByteArray (2, 0xd0, (id()<<4) | segment));
-}
-
-MidiByteArray
-Meter::zero ()
-{
-	return MidiByteArray (2, 0xD0, (id()<<4 | 0));
+	return std::make_pair (over, def);
 }
diff --git a/libs/surfaces/mackie/meter.h b/libs/surfaces/mackie/meter.h
index 5046d1ca55..254b321164 100644
--- a/libs/surfaces/mackie/meter.h
+++ b/libs/surfaces/mackie/meter.h
@@ -42,6 +42,7 @@ public:
 	bool enabled () const { return _enabled; }
 
 	MidiByteArray zero();
+	static std::pair<bool, float> calculate_meter_over_and_deflection (float dB);
 
 	static Control* factory (Surface&, int id, const char*, Group&);