From efbc3f3de37e745fc8e55104e46433060f84cb52 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 14 Jun 2020 19:13:13 -0400 Subject: [PATCH] volume module only uses default. old alsa rm'd --- .local/bin/statusbar/volume | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.local/bin/statusbar/volume b/.local/bin/statusbar/volume index 2766ed2..61588c3 100755 --- a/.local/bin/statusbar/volume +++ b/.local/bin/statusbar/volume @@ -1,13 +1,8 @@ #!/bin/sh -# Prints the current volume or 🔇 if muted. Uses PulseAudio by default, -# uncomment the ALSA lines if you remove PulseAudio. +# Prints the current volume or 🔇 if muted. case $BLOCK_BUTTON in - # 1) setsid -f "$TERMINAL" -e alsamixer ;; - # 2) amixer sset Master toggle ;; - # 4) amixer sset Master 5%+ >/dev/null 2>/dev/null ;; - # 5) amixer sset Master 5%- >/dev/null 2>/dev/null ;; 1) setsid -f "$TERMINAL" -e pulsemixer ;; 2) pamixer -t ;; 4) pamixer --allow-boost -i 1 ;; @@ -18,14 +13,9 @@ case $BLOCK_BUTTON in 6) "$TERMINAL" -e "$EDITOR" "$0" ;; esac -volstat="$(pactl list sinks)" -# volstat="$(amixer get Master)" # ALSA only equivalent. +[ $(pamixer --get-mute) = true ] && echo 🔇 && exit -echo "$volstat" | grep -q "Mute: yes" && printf "🔇\\n" && exit -# echo "$volstat" | grep "\[off\]" >/dev/null && printf "🔇\\n" && exit # ALSA - -vol="$(echo "$volstat" | grep '[0-9]\+%' | sed "s,.* \([0-9]\+\)%.*,\1,;1q")" -# vol=$(echo "$volstat" | grep -o "\[[0-9]\+%\]" | sed "s/[^0-9]*//g;1q") # ALSA +vol="$(pamixer --get-volume)" if [ "$vol" -gt "70" ]; then icon="🔊" @@ -35,4 +25,4 @@ else icon="🔉" fi -printf "%s%s%%\\n" "$icon" "$vol" +echo "$icon$vol%"