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}")&"
videourl="$(urlsafe "mp4/${info%.*}.mp4")"
elif [ -z "$info" ]; then
videourl="$(urlsafe "${location#/}")"
+else [ -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" \
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"
"${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
fi
- 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 &
+ 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}"
;;