Use updated volsv

1 files changed, 9 insertions, 2 deletions

diff --git a/volsv b/volsv
index 16e3ce2..2969963 100644
--- a/volsv
+++ b/volsv
@@ -1,4 +1,8 @@
 #!/bin/sh
+# calculate average of two integers (for ALSA)
+average () {
+  echo "$(( $(( $1 + $2 )) / 2 ))$"
+}
 # print error message
 printerror () {
   echo "$1 is not a recognized command or flag"
@@ -10,7 +14,8 @@ pulsesv () {
     "down" | "-d") pamixer -d 5 ;;
     "toggle" | "-t") pamixer -t ;;
     "mic" | "-m") pamixer --source 1 -t ;;
-    "getm" | "-g") ;;
+    "getv" | "-v") printf "%s%%\n" "$(pamixer --get-volume)" ;;
+    "getm" | "-g") pamixer --get-mute | sed 's/[Ff]alse/\[on\]/;s/[Tt]rue/\[off\]/' ;;
     *) printerror "$1" ;;
   esac
 }
@@ -20,7 +25,9 @@ alsasv () {
     "up" | "-i") amixer sset Master 5%+ ;;
     "down" | "-d") amixer sset Master 5%- ;;
     "toggle" | "-t") amixer sset Master toggle ;;
-    "getm" | "-g") ;;
+    "mic" | "-m") amixer sset Capture toggle ;;
+    "getv" | "-v") amixer sget Master | grep '\[[0-9]*\%\]' | cut -d' ' -f6 | sed 's/\[//;s/\]//g' ;;
+    "getm" | "-g") amixer sget Master | grep '\[o[fn]' | cut -d' ' -f8 | head -1 ;;
     *) printerror "$1" ;;
   esac
 }