Move volume control to separate subcommand

mkit/config.ini

@@ -41,6 +41,7 @@
     src/bin/saturnin                        = saturnin
 
 [files:libexec]
+    src/libexec/saturnin-au                 = saturnin-au
     src/libexec/saturnin-czrates            = saturnin-czrates
     src/libexec/saturnin-clip               = saturnin-clip
     src/libexec/saturnin-dmenu              = saturnin-dmenu

src/libexec/saturnin-au

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+. $(ffoom path)
+
+ffoo import pretty
+
+
+usage() {
+    usage_is "up"     \
+             "down"   \
+             "flip"   \
+             "mute"   \
+             "unmute"
+}
+
+
+sound_is_muted() {
+    #
+    # At least one playback channel is muted
+    #
+    local master_status="$(amixer get Master)"
+    echo "$master_status" \
+      | grep "Playback channels" \
+      | sed -e 's/.*: //; s/ - /\n/' \
+      | while read chname
+        do
+            grep -e "^ *$chname" <<<"$master_status"
+        done \
+      | grep -qse '\[off\]$'
+}
+
+do_down() {
+    #
+    # turn volume down
+    #
+    amixer -q sset Master 5%-
+}
+
+do_flip() {
+    #
+    # mute or unmute
+    #
+    if sound_is_muted;
+    then
+        amixer -q sset Master unmute;
+    else
+        amixer -q sset Master mute;
+    fi
+}
+
+do_mute() {
+    #
+    # mute
+    #
+    amixer -q sset Master mute
+}
+
+do_up() {
+    #
+    # turn volume up
+    #
+    amixer -q sset Master 5%+
+}
+
+do_unmute() {
+    #
+    # mute
+    #
+    amixer -q sset Master unmute
+}
+
+
+action=
+while true; do case "$1" in
+    up)     action=up;     shift ;;
+    down)   action=down;   shift ;;
+    flip)   action=flip;   shift ;;
+    mute)   action=mute;   shift ;;
+    unmute) action=unmute; shift ;;
+    "")     break                ;;
+    *)      usage                ;;
+esac done
+
+debug "\$@='$@'"
+debug -v action
+
+case $action in
+    up|down|flip|mute|unmute) do_$action ;;
+    *)                        usage      ;;
+esac

src/libexec/saturnin-iam

@@ -18,10 +18,7 @@ available_commands() {
     echo back
     echo bbl
     echo bbldone
-    echo deaf
-    echo deafnomore
     echo gone
-    echo listening
     echo ooo
     echo wfh
     echo writing
@@ -60,21 +57,6 @@ set_status() {
     saturnin conf -p iam.saying.like.this.$what | bash
 }
 
-sound_is_muted() {
-    #
-    # At least one playback channel is muted
-    #
-    local master_status="$(amixer get Master)"
-    echo "$master_status" \
-      | grep "Playback channels" \
-      | sed -e 's/.*: //; s/ - /\n/' \
-      | while read chname
-        do
-            grep -e "^ *$chname" <<<"$master_status"
-        done \
-      | grep -qse '\[off\]$'
-}
-
 
 #
 # hooks
@@ -146,20 +128,6 @@ i_am_bbldone() {
     setxkbmap "$(saturnin conf -1 -p iam.typing.lang)"
 }
 
-i_am_deaf() {
-    #
-    # so turn volume up
-    #
-    amixer -q sset Master 5%+
-}
-
-i_am_deafnomore() {
-    #
-    # so turn volume back down
-    #
-    amixer -q sset Master 5%-
-}
-
 i_am_gone() {
     #
     # gone fishin'
@@ -171,18 +139,6 @@ i_am_gone() {
     i_am_back
 }
 
-i_am_listening() {
-    #
-    # to the real world or to the box
-    #
-    if sound_is_muted;
-    then
-        amixer -q sset Master unmute;
-    else
-        amixer -q sset Master mute;
-    fi
-}
-
 i_am_ooo() {
     #
     # too dangerous to implement