Clean up the system volume in mode-line display code

1 files changed, 10 insertions, 19 deletions

diff --git a/.emacs.d/lisp/bandali-exwm.el b/.emacs.d/lisp/bandali-exwm.el
index 4cd2d1c..e7f83ce 100644
--- a/.emacs.d/lisp/bandali-exwm.el
+++ b/.emacs.d/lisp/bandali-exwm.el
@@ -1,6 +1,6 @@
 ;;; bandali-exwm.el --- bandali's EXWM configuration  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2018-2022  Amin Bandali
+;; Copyright (c) 2018-2023 Amin Bandali
 
 ;; Author: Amin Bandali <bandali@gnu.org>
 ;; Keywords: tools
@@ -182,62 +182,53 @@ around if needed."
                  (interactive)
                  (start-process-shell-command
                   "dmneu-pamixer" nil "dmenu-pamixer")
-                 (b/set-volume-level (b/get-volume-level))
-                 (force-mode-line-update)))
+                 (b/volume-update)))
    ([XF86AudioMute] .             ; borken on my X200 :-(
     (lambda ()
       (interactive)
       (start-process "" nil "pamixer" "--toggle-mute")
-      (b/set-volume-mute (b/get-volume-mute))
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([\s-XF86AudioMute] .            ; toggle mic mute
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--default-source" "--toggle-mute")
-      (b/set-volume-mute (b/get-volume-mute 'mic) 'mic)
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([XF86Launch1] .
     (lambda ()
       (interactive)
       (start-process "" nil "pamixer" "--toggle-mute")
-      (b/set-volume-mute (b/get-volume-mute))
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([\s-XF86Launch1] .            ; toggle mic mute
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--default-source" "--toggle-mute")
-      (b/set-volume-mute (b/get-volume-mute 'mic) 'mic)
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([XF86AudioLowerVolume] .
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--allow-boost" "--decrease" "5")
-      (b/set-volume-level (b/get-volume-level))
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([XF86AudioRaiseVolume] .
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--allow-boost" "--increase" "5")
-      (b/set-volume-level (b/get-volume-level))
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([\s-XF86AudioLowerVolume] .
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--default-source" "--decrease" "5")
-      (b/set-volume-level (b/get-volume-level 'mic) 'mic)
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([\s-XF86AudioRaiseVolume] .
     (lambda ()
       (interactive)
       (start-process
        "" nil "pamixer" "--default-source" "--increase" "5")
-      (b/set-volume-level (b/get-volume-level 'mic) 'mic)
-      (force-mode-line-update)))
+      (b/volume-update)))
    ([XF86AudioPlay] .
     (lambda ()
       (interactive)