1 files changed, 2 insertions, 10 deletions
diff --git a/swob.sh b/swob.sh
index d47e980..394d7d9 100755
--- a/swob.sh
+++ b/swob.sh
@@ -95,14 +95,6 @@ get_audio_type() {
 	SWOB_AUDIO=alsa # default to ALSA
 }
 
-pactl_vol() {
-	pactl set-sink-"$1" @DEFAULT_SINK@ "$(echo "$2" | sed -E 's/(.*)([+-])$/\2\1/')"
-}
-
-percent_to_float() {
-	awk -v percent="$1" 'BEGIN{printf "%.1f", percent/100}'
-}
-
 set_vol() {
 	set +fu
 	get_audio_type
@@ -112,7 +104,7 @@ set_vol() {
 	pipewire)
 		case $1 in
 		toggle)	to_set=mute ;;
-		*)	to_set="volume -l $(percent_to_float "$SWOB_MAX_VOLUME")" ;;
+		*)	to_set="volume -l $(awk -v percent="$SWOB_MAX_VOLUME" 'BEGIN{printf "%.1f", percent/100}')" ;;
 		esac
 		wpctl set-$to_set @DEFAULT_AUDIO_SINK@ "$1"
 		wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed -E \
@@ -131,7 +123,7 @@ set_vol() {
 		if test "$to_set" = "mute" \
 			-o \( "$percent" -lt "$SWOB_MAX_VOLUME" \) \
 			-o \( "$percent" -eq "$SWOB_MAX_VOLUME" -a "$sign" = "-" \); then
-			pactl_vol "$to_set" "$1"
+			pactl set-sink-$to_set @DEFAULT_SINK@ "$(echo "$1" | sed -E 's/(.*)([+-])$/\2\1/')"
 		else
 			pactl set-sink-$to_set @DEFAULT_SINK@ "${SWOB_MAX_VOLUME}%"
 		fi