X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fwatch.sh;h=cc47088c0bebc5e73c1b13895a307db1dd51e896;hb=efefeef8289f064b3875b9bae1d1b007f5c1d5f8;hp=d0987177c6e157318b6b46ec4e35ed773100ca1a;hpb=47b905d14103c01625d16fe557e63e34317c6453;p=serve0

diff --git a/actions/watch.sh b/actions/watch.sh
index d098717..cc47088 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -2,11 +2,12 @@
 
 cgi_refdata
 info="${_GET[i]}"
+watch="${_GET[w]:-${_COOKIE[watch]}}"
 location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
-order="${_REF[o]}"
-search="${_REF[s]}"
-filter="${_REF[f]}"
-page="${_REF[pn]}"
+order="${_POST[o]}"
+search="${_POST[s]}"
+filter="${_POST[f]}"
+page="${_POST[pn]}"
 
 watch_link=''
 [ -n "$location" ] && watch_link="l=$(urlsafe "${location}")&"
@@ -27,15 +28,16 @@ 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#/}")"
 else
   videourl="$(urlsafe "videos/$info")"
 fi
 
-case "${_COOKIE[watch]}" in
+case "$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&w=server&i="
+    redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
@@ -49,12 +51,46 @@ case "${_COOKIE[watch]}" in
     redirect "$videourl"
   ;;
   server)
-    if [ -n "$info" ]; then
-      DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 nohup /usr/bin/mplayer -ao pulse --quiet "${_DATA}/videos/$info" >/dev/null 2>/dev/null &
-    elif [ -n "$location" ]; then
-      DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 nohup /usr/bin/mplayer -ao pulse --quiet "${treeroot%/}/${location#/}" >/dev/null 2>/dev/null &
+    [ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
+    [ -n "$info" ]     && playuri="${_DATA}/videos/$info"
+
+    metafile="${_DATA}/meta/${info}.meta"
+
+    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"
+
+    if [ -f "$metafile" ]; then
+      cp "$metafile" "$playmeta"
+    else
+      rm "$playmeta"
+      "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
     fi
-    redirect "$HTTP_REFERER"
+
+    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}"
   ;;
   *) redirect "?p=view&${watch_link}"
   ;;