X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fwatch.sh;h=5d503b07d70a08737dbc364ddea5d553b4bd0068;hb=1418058c8b8777e0af4aa21236e12d676942eee9;hp=3fae936a01491b525a3bbb26e0accc6684eea8b5;hpb=a71c2f4849203931aa2437e3ff7d8c200c6f5239;p=serve0

diff --git a/actions/watch.sh b/actions/watch.sh
index 3fae936..5d503b0 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -3,10 +3,11 @@
 cgi_refdata
 info="${_GET[i]}"
 location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
-order="${_REF[o]}"
-search="${_REF[s]}"
-filter="${_REF[f]}"
-page="${_REF[pn]}"
+foreign="$(validate "${_GET[url]}" 'https?://.*' '')"
+order="${_POST[o]}"
+search="${_POST[s]}"
+filter="${_POST[f]}"
+page="${_POST[pn]}"
 
 watch_link=''
 [ -n "$location" ] && watch_link="l=$(urlsafe "${location}")&"
@@ -29,15 +30,17 @@ if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
   videourl="$(urlsafe "mp4/${info%.*}.mp4")"
 elif [ -z "$info" ]; then
   videourl="$(urlsafe "${location#/}")"
+elif [ -z "$foreign" ]; then
+  _COOKIE[watch]=server
+  videourl="${_GET[url]}"
 else
   videourl="$(urlsafe "videos/$info")"
 fi
 
-case "${_COOKIE[watch]}" in
+case "$_COOKIE[watch]" in
   raspi)
-    rpiaddr="http://pfostenpanne.helmchyn.no-ip.biz/?player=play&path="
-    [ $height -gt 480 -a $width -gt 480 ] && redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")" \
-                                          || redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
+    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
+    redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
@@ -59,26 +62,36 @@ case "${_COOKIE[watch]}" in
     playmeta="${_DATA}/mplayer.meta"
     fifofile="${_DATA}/mplayer.fifo"
     statusfile="${_DATA}/mplayer.status"
+    statusfile="/tmp/mplayer.status"
     volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
     [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
 
     debug PLAYURI "$playuri"
 
-    [ -f "$metafile" ] && cp "$metafile" "$playmeta" \
-                       || "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
-
-    DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
-      nohup /usr/bin/mplayer -ao pulse \
-      -slave -input file="$fifofile" \
-      -volume "$volume" \
-      "$playuri" >"$statusfile" 2>/dev/null &
-
-    # # MPlayer2:
-    # DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
-    #   nohup /usr/bin/mplayer -ao pulse --quiet \
-    #   --slave --input=file="$fifofile" \
-    #   --volume="$volume" \
-    #   "$playuri" >/dev/null 2>/dev/null &
+    if [ -f "$metafile" ]; then
+      cp "$metafile" "$playmeta"
+    else
+      rm "$playmeta"
+      "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
+    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 &
+
+    chmod 600 "$statusfile"
 
     redirect "?p=playctl&${watch_link}"
   ;;