Merge branch 'master' of https://github.com/krebscode/painload

2 files changed, 16 insertions, 3 deletions

diff --git a/god/ivan/ivan b/god/ivan/ivan
index 5099114a..c28bd3cb 100755
--- a/god/ivan/ivan
+++ b/god/ivan/ivan
@@ -1,5 +1,7 @@
 #!/bin/bash
-SATZ_LISTE=/krebs/ivan/satz-liste
+
+cd $(dirname $(readlink -f $0))
+SATZ_LISTE=satz-liste
 p="${noise_pitch-10}"
 v="${noise_lang-de}"
 k="${noise_capital-0}"
@@ -13,6 +15,9 @@ function helpme ()
   $0 [-d]
     -d   -- daemonize
     -h   -- this help file
+
+  environment:
+     USING_ESPEAK   - if set, ivan will talk with espeak
 EOF
   exit 0
 }
@@ -21,7 +26,11 @@ EOF
 
 while true
 do
-  espeak -v $v -p $p -k $k -a $a -g $g "`shuf \"$SATZ_LISTE\" | tail -1`"
+  if [ -n "${USING_ESPEAK:-}" ];then
+    espeak -v $v -p $p -k $k -a $a -g $g "`shuf \"$SATZ_LISTE\" | tail -1`"
+  else
+    ../../util/bin/naturalvoices2.sh "`shuf  \"$SATZ_LISTE\" | tail -1`"
+  fi
   [ ! "${1:-}" = "-d" ] && exit 0   # break if not daemonized
   sleep $((${RANDOM}%${RND_DELAY}))
 done
diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
index 4d8015aa..c310414f 100755
--- a/util/bin/naturalvoices2.sh
+++ b/util/bin/naturalvoices2.sh
@@ -1,6 +1,10 @@
+#!/bin/sh
 text=$(echo $* | sed 's/ /+/g')
 voice="klara"
 base_url="http://192.20.225.36"
 
-mplayer $base_url$( curl -Ss -A "Mozilla" -d "voice=$voice" -d "txt=$text" -d "speakButton=SPEAK" $base_url/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
+TMPFILE=`mktemp`
+trap "rm $TMPFILE" TERM INT EXIT
 
+wget $base_url$( curl -Ss -A "Mozilla" -d "voice=$voice" -d "txt=$text" -d "speakButton=SPEAK" $base_url/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g') -O $TMPFILE
+aplay $TMPFILE