allow mplayer error output to be written to debug

[serve0] / actions / watch.sh

diff --git a/actions/watch.sh b/actions/watch.sh
index 5d503b07d70a08737dbc364ddea5d553b4bd0068..dbaa919b027e1276cf6b8468f159ea4eb23e33bc 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -28,11 +28,11 @@ linkinfo="$(urlsafe "$info")"
 if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
   [ -e "${_DATA}/videos/${info%.*}.mp4" ] || ln -s "${_DATA}/videos/$info" "${_DATA}/mp4/${info%.*}.mp4"
   videourl="$(urlsafe "mp4/${info%.*}.mp4")"
-elif [ -z "$info" ]; then
-  videourl="$(urlsafe "${location#/}")"
-elif [ -z "$foreign" ]; then
+elif [ -n "$foreign" ]; then
   _COOKIE[watch]=server
   videourl="${_GET[url]}"
+elif [ -z "$info" ]; then
+  videourl="$(urlsafe "${location#/}")"
 else
   videourl="$(urlsafe "videos/$info")"
 fi
@@ -40,7 +40,7 @@ fi
 case "$_COOKIE[watch]" in
   raspi)
     rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
-    redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
+    redirect "${rpiaddr}$(urlsafe "http://${HTTP_HOST}/${videourl}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
@@ -56,6 +56,7 @@ case "$_COOKIE[watch]" in
   server)
     [ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
     [ -n "$info" ]     && playuri="${_DATA}/videos/$info"
+    [ -n "$foreign" ]  && playuri="$videourl"
 
     metafile="${_DATA}/meta/${info}.meta"
 
@@ -63,7 +64,7 @@ case "$_COOKIE[watch]" in
     fifofile="${_DATA}/mplayer.fifo"
     statusfile="${_DATA}/mplayer.status"
     statusfile="/tmp/mplayer.status"
-    volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
+    volume="$(validate "$(cat "${_DATA}/mplayer.volume" || true)" '[1-9]?[0-9]|100' 20)"
     [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
 
     debug PLAYURI "$playuri"
@@ -78,18 +79,19 @@ case "$_COOKIE[watch]" in
     export DISPLAY=":0"
     uid="$(id |sed -rn '1s;.*uid=([0-9]+)[^0-9].*;\1;p')"
     export XDG_RUNTIME_DIR="/run/user/$uid"  # required for Pulseaudio
-    xrandr >/dev/null  # helps enable all screens
-
-    # nohup /usr/bin/mplayer \
-    #   -slave -input file="$fifofile" \
-    #   -volume "$volume" \
-    #   "$playuri" >"$statusfile" 2>/dev/null &
-
-    # MPlayer2: (statusline on stderr)
-    nohup /usr/bin/mplayer \
-      --slave --input=file="$fifofile" \
-      --volume="$volume" \
-      "$playuri" 2>"$statusfile" >/dev/null &
+    xrandr || true >/dev/null  # helps enable all screens
+
+    if mplayer |grep -q MPlayer2; then
+      nohup /usr/bin/mplayer \
+        --slave --input=file="$fifofile" \
+        --volume="$volume" \
+        "$playuri" 2>"$statusfile" >/dev/null &
+    else
+      nohup /usr/bin/mplayer \
+        -slave -input file="$fifofile" \
+        -volume "$volume" \
+        "$playuri" >"$statusfile" &
+    fi
 
     chmod 600 "$statusfile"