aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/Makefile2
-rwxr-xr-xbin/vol29
-rw-r--r--bin/volCtl24
3 files changed, 23 insertions, 32 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 0189db6..ea174e3 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -14,5 +14,5 @@ install:
install night $(HOME)/bin/
install wallpaper $(HOME)/bin/
install status-bar $(HOME)/bin/
- install volCtl $(HOME)/bin/
+ install vol $(HOME)/bin/
diff --git a/bin/vol b/bin/vol
index 2ddc2d4..1071d8c 100755
--- a/bin/vol
+++ b/bin/vol
@@ -1,9 +1,24 @@
#!/bin/sh
-sink=1
-step=5
-# Default down
-mode=-
-case $1 in
- up) mode=+
+sinkName=$(pacmd info | grep 'Default sink' | awk '{print $4}')
+sinkNumber=$(pacmd info | grep "sink:.*$sinkName" | awk '{print $2}')
+
+getVolume() {
+ volumeInput=$(pactl list sinks)
+ currentVolume=$(echo "${volumeInput#*Sink #$sinkNumber}" | grep -E 'V.*-left' | grep -oE '[0-9]+%' | tail -n 1)
+ notify-send "Volume: $currentVolume"
+}
+
+case "$1" in
+ up) pactl set-sink-volume @DEFAULT_SINK@ +5%; getVolume;;
+ down) pactl set-sink-volume @DEFAULT_SINK@ -5%; getVolume;;
+ mute) muted=$(pactl list sinks | grep 'Mute: yes')
+ if [ -z "$muted" ]; then
+ pactl set-sink-mute @DEFAULT_SINK@ 1
+ notify-send Volume: Muted
+ else
+ pactl set-sink-mute @DEFAULT_SINK@ 0
+ getVolume
+ fi;;
+ *) echo error;;
esac
-pactl set-sink-volume "$sink" "$mode${step}%"
+
diff --git a/bin/volCtl b/bin/volCtl
deleted file mode 100644
index 1071d8c..0000000
--- a/bin/volCtl
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-sinkName=$(pacmd info | grep 'Default sink' | awk '{print $4}')
-sinkNumber=$(pacmd info | grep "sink:.*$sinkName" | awk '{print $2}')
-
-getVolume() {
- volumeInput=$(pactl list sinks)
- currentVolume=$(echo "${volumeInput#*Sink #$sinkNumber}" | grep -E 'V.*-left' | grep -oE '[0-9]+%' | tail -n 1)
- notify-send "Volume: $currentVolume"
-}
-
-case "$1" in
- up) pactl set-sink-volume @DEFAULT_SINK@ +5%; getVolume;;
- down) pactl set-sink-volume @DEFAULT_SINK@ -5%; getVolume;;
- mute) muted=$(pactl list sinks | grep 'Mute: yes')
- if [ -z "$muted" ]; then
- pactl set-sink-mute @DEFAULT_SINK@ 1
- notify-send Volume: Muted
- else
- pactl set-sink-mute @DEFAULT_SINK@ 0
- getVolume
- fi;;
- *) echo error;;
-esac
-