summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrebs <krebs@fuerkrebs>2011-09-09 21:26:15 -0400
committerkrebs <krebs@fuerkrebs>2011-09-09 21:26:15 -0400
commit8712dfa17f0dd7b90c646e13d2cd4e0d4c5a11e6 (patch)
tree8e0e3e964d1680704c6275fb71966d31a7808650
parent27a38dd34af2e035eb0d37ce2f27f169763c3538 (diff)
//god/overlord: be the right and only one
This commit also makes the //noise module a pure wrapper around the read overlord.
-rwxr-xr-xgod/overlord/index27
-rwxr-xr-xgod/overlord/overlord19
-rwxr-xr-xnoise/modules/overlord33
3 files changed, 35 insertions, 44 deletions
diff --git a/god/overlord/index b/god/overlord/index
new file mode 100755
index 00000000..27506ccd
--- /dev/null
+++ b/god/overlord/index
@@ -0,0 +1,27 @@
+#! /bin/sh
+set -euf
+
+# cd //
+cd $(dirname $(readlink -f $0))/../..
+
+max=100
+step=10
+min=0
+
+# fade-out streams
+for i in `seq $max -$step $min`; do
+ amixer -q -c 0 -D hw:0 sset Front $i%
+ sleep 0.1
+done
+streams/streams stop
+
+amixer -q -c 0 -D hw:0 sset Front $max%
+mplayer god/overlord/announce.mp3 >/dev/null
+espeak -v de -s 120 -a 900 "$*"
+
+# fade-in streams
+streams/streams start
+for i in `seq $min $step $max`; do
+ sleep 0.1
+ amixer -q -c 0 -D hw:0 sset Front $i%
+done
diff --git a/god/overlord/overlord b/god/overlord/overlord
deleted file mode 100755
index 501afc80..00000000
--- a/god/overlord/overlord
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-set -euf
-
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50%
-/krebs/streams/streams stop
-amixer -q -c 0 -D hw:0 sset Front 100%
-mplayer announce.mp3
-/krebs/streams/streams start &
-espeak -v de -s 120 -a 900 "$*"
-amixer -q -c 0 -D hw:0 sset Front 40%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80%
-sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90%
diff --git a/noise/modules/overlord b/noise/modules/overlord
index 53766116..ded8627a 100755
--- a/noise/modules/overlord
+++ b/noise/modules/overlord
@@ -1,31 +1,14 @@
#! /bin/sh
set -euf
-max=100
-step=10
-min=0
-
-announce() {
- # fade-out streams
- for i in `seq $max -$step $min`; do
- amixer -q -c 0 -D hw:0 sset Front $i%
- sleep 0.1
- done
- /krebs/streams/streams stop
-
- amixer -q -c 0 -D hw:0 sset Front $max%
- mplayer /krebs/god/overlord/announce.mp3 >/dev/null
- espeak -v de -s 120 -a 900 "$*"
-
- # fade-in streams
- /krebs/streams/streams start
- for i in `seq $min $step $max`; do
- sleep 0.1
- amixer -q -c 0 -D hw:0 sset Front $i%
- done
-}
+# cd //
+cd $(dirname $(readlink -f $0))/../..
case "${1---help}" in
- --help) echo "Make an announcement! Usage: /overlord <text>";;
- *) announce "$@";;
+ --help)
+ echo "Make an announcement! Usage: /overlord <text>"
+ ;;
+ *)
+ exec god/overlord/index "$@"
+ ;;
esac