From 588ce18c52cebf966d678f3daeb87b8f5913babe Mon Sep 17 00:00:00 2001
From: Martin Piatka <piatka@cesnet.cz>
Date: Thu, 24 Mar 2022 14:32:52 +0100
Subject: [PATCH] GUI/vuMeter: Simplify a bit

---
 gui/QT/widget/vuMeterWidget.cpp | 9 ++++-----
 gui/QT/widget/vuMeterWidget.hpp | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gui/QT/widget/vuMeterWidget.cpp b/gui/QT/widget/vuMeterWidget.cpp
index 62d86756e..aed0bade8 100644
--- a/gui/QT/widget/vuMeterWidget.cpp
+++ b/gui/QT/widget/vuMeterWidget.cpp
@@ -25,9 +25,11 @@ ug_connection *connectLoop(int port){
 	return connection;
 }
 
+	static constexpr int meterVerticalPad = 5;
+	static constexpr int meterBarPad = 2;
+	static constexpr double zeroLevel = -40.0;
 }//anon namespace
 
-constexpr double VuMeterWidget::zeroLevel;
 
 void VuMeterWidget::updateVal(){
 	updateVolumes();
@@ -39,12 +41,9 @@ void VuMeterWidget::updateVal(){
 		barLevel[i] = std::max(barLevel[i] - fallSpeed / updatesPerSecond, 0.0);
 		rmsLevel[i] = std::max(rmsLevel[i] - fallSpeed / updatesPerSecond, 0.0);
 
-#if 1
 		double newPeakHeight = 100 - std::max(peak[i], zeroLevel) * (100 / zeroLevel);
 		double newRmsHeight = 100 - std::max(rms[i], zeroLevel) * (100 / zeroLevel);
-#else
-		double newHeight = pow(10.0, peak[i] / 20.0) * 100;
-#endif
+
 		barLevel[i] = std::max(barLevel[i], newPeakHeight);
 		rmsLevel[i] = std::max(rmsLevel[i], newRmsHeight);
 	}
diff --git a/gui/QT/widget/vuMeterWidget.hpp b/gui/QT/widget/vuMeterWidget.hpp
index 6db1f35a4..34d869a56 100644
--- a/gui/QT/widget/vuMeterWidget.hpp
+++ b/gui/QT/widget/vuMeterWidget.hpp
@@ -63,10 +63,6 @@ private:
 
 	std::chrono::system_clock::time_point last_connect;
 
-	static const int meterVerticalPad = 5;
-	static const int meterBarPad = 2;
-	static constexpr double zeroLevel = -40.0;
-
 	void paintMeter(QPainter&, int x, int y, int width, int height, double peak, double rms);
 	void paintScale(QPainter&, int x, int y, int width, int height);