Index volume by alsa.device property

[khatus.git] / src / awk / exe / bar.awk

diff --git a/src/awk/exe/bar.awk b/src/awk/exe/bar.awk
index 43126ff..bd37305 100644 (file)
--- a/src/awk/exe/bar.awk
+++ b/src/awk/exe/bar.awk
@@ -10,15 +10,18 @@
 # -----------------------------------------------------------------------------
 # Input
 # -----------------------------------------------------------------------------
-$3 == "data" {
-    delete msg
-    msg_in_parse(msg, $0)
+{
+  delete msg
+  msg_parse(msg, $0)
+}
+
+msg["type"] == "data" {
     cache_update(msg["node"], msg["module"], msg["key"], msg["val"])
 }
 
-$1 == Node && \
-$2 == "khatus_sensor_datetime" && \
-$3 == "data" {
+msg["node"]   == Node && \
+msg["module"] == "khatus_sensor_datetime" && \
+msg["type"]   == "data" {
     # Code for bar_make_status is expected to be passed as an
     # additional source file, using  -f  flag.
     msg_out_status_bar(bar_make_status())
@@ -191,17 +194,17 @@ function bar_make_status_backlight_percent(    src) {
 # Volume
 # -----------------------------------------------------------------------------
 
-function bar_make_status_volume_pulseaudio_sink(sink,    mu, vl, vr, show) {
-    cache_get(mu, "khatus_sensor_volume", "mute"      Kfs sink, 5)
-    cache_get(vl, "khatus_sensor_volume", "vol_left"  Kfs sink, 5)
-    cache_get(vr, "khatus_sensor_volume", "vol_right" Kfs sink, 5)
+function bar_make_status_volume_alsa_device(device,    mu, vl, vr, show) {
+    cache_get(mu, "khatus_sensor_volume", "mute"      Kfs device, 5)
+    cache_get(vl, "khatus_sensor_volume", "vol_left"  Kfs device, 5)
+    cache_get(vr, "khatus_sensor_volume", "vol_right" Kfs device, 5)
     show = "--"
     if (!mu["is_expired"] && !vl["is_expired"] && !vr["is_expired"]) {
              if (mu["value"] == "yes") {show = "X"}
         else if (mu["value"] == "no")  {show = vl["value"] " " vr["value"]}
         else {
             msg_out_log_error(\
-                "bar_make_status_volume_pulseaudio_sink: " sink ". ", \
+                "bar_make_status_volume_alsa_device: " device ". ", \
                 "Unexpected value for 'mute' field: " mu["value"] \
             )
         }