X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fwatch.sh;h=5aff94559b1c65d7e32759572d8a7110e711dbda;hb=94b22476b017682875212d6c569b221056dd7bb7;hp=5b4119f7612f6b51c32f367f9b4655e5d4531be2;hpb=7325a10deded9a135b354e77d231a0ab38e13925;p=serve0

diff --git a/actions/watch.sh b/actions/watch.sh
index 5b4119f..5aff945 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -9,13 +9,9 @@ search="${_POST[s]}"
 filter="${_POST[f]}"
 page="${_POST[pn]}"
 
-watch_link=''
+watch_link="${_POST[page]}&"
 [ -n "$location" ] && watch_link="l=$(urlsafe "${location}")&"
 [ -n "$info" ]     && watch_link="i=$(urlsafe "${info}")&"
-[ -n "$order" ]    && watch_link="${watch_link}o=${order}&"
-[ -n "$search" ]   && watch_link="${watch_link}s=${search}&"
-[ -n "$filter" ]   && watch_link="${watch_link}f=${filter}&"
-[ -n "$page" ]     && watch_link="${watch_link}pn=${page}"
 
 meta="${_DATA}/meta/$info.meta"
 head -n1 "$meta" |read length width height filename
@@ -31,6 +27,7 @@ if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
 elif [ -n "$foreign" ]; then
   _COOKIE[watch]=server
   videourl="${_GET[url]}"
+  watch_link="w=$(urlsafe "${_GET[return]}")"
 elif [ -z "$info" ]; then
   videourl="$(urlsafe "${location#/}")"
 else
@@ -39,8 +36,8 @@ fi
 
 case "$_COOKIE[watch]" in
   raspi)
-    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
-    redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
+    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch"
+    redirect "${rpiaddr}&url=$(urlsafe "http://${HTTP_HOST}/${videourl}")&return=$(urlsafe "http://${HTTP_HOST}/${_POST[page]}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
@@ -56,6 +53,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 +61,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"
@@ -72,24 +70,26 @@ case "$_COOKIE[watch]" in
       cp "$metafile" "$playmeta"
     else
       rm "$playmeta"
-      "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
+      "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >&-
     fi
 
     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 >&-  # helps enable all screens
+    xvkbd -text '\x+10000\y+10000' || true >&-
+
+    if mplayer |grep -q MPlayer2; then
+      nohup /usr/bin/mplayer \
+        --slave --input=file="$fifofile" \
+        --volume="$volume" \
+        "$playuri" 2>"$statusfile" >&- &
+    else
+      nohup /usr/bin/mplayer \
+        -slave -input file="$fifofile" \
+        -volume "$volume" \
+        "$playuri" >"$statusfile" &
+    fi
 
     chmod 600 "$statusfile"