From 44aa3dd564f560af64919fbcc5df095fcc987b34 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Mon, 21 Mar 2022 14:17:16 +0100
Subject: [PATCH] Clean up the f32_hz_then_khz formatter

---
 src/formatters.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/formatters.rs b/src/formatters.rs
index 0577a993..2213e3d2 100644
--- a/src/formatters.rs
+++ b/src/formatters.rs
@@ -70,14 +70,14 @@ pub fn from_f32_panning() -> Arc<dyn Fn(&str) -> Option<f32> + Send + Sync> {
     })
 }
 
-/// Round an `f32` value and divide it by 1000 when it gets over 1000
+/// Format a `f32` Hertz value as a rounded `Hz` below 1000 Hz, and as a rounded `kHz` value above
+/// 1000 Hz. This already includes the unit.
 pub fn f32_hz_then_khz(digits: usize) -> Arc<dyn Fn(f32) -> String + Send + Sync> {
-    Arc::new(move |x| {
-        if x < 1000.0 {
-            format!("{:.digits$}", x)
+    Arc::new(move |value| {
+        if value < 1000.0 {
+            format!("{:.digits$} Hz", value)
         } else {
-            let digits = digits + 1;
-            format!("{:.digits$}", x / 1000.0)
+            format!("{:.digits$} kHz", value / 1000.0, digits = digits.min(1))
         }
     })
 }