cgi_refdata
info="${_GET[i]}"
location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
+foreign="$(validate "${_GET[url]}" 'https?://.*' '')"
order="${_POST[o]}"
search="${_POST[s]}"
filter="${_POST[f]}"
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 [ -n "$foreign" ]; then
+ _COOKIE[watch]=server
+ videourl="${_GET[url]}"
elif [ -z "$info" ]; then
videourl="$(urlsafe "${location#/}")"
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://${HTTP_HOST}/${videourl}")"
;;
480p)
[ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
server)
[ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
[ -n "$info" ] && playuri="${_DATA}/videos/$info"
+ [ -n "$foreign" ] && playuri="$videourl"
metafile="${_DATA}/meta/${info}.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)"
+ 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"
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 -ao pulse \
- -slave -input file="$fifofile" \
- -volume "$volume" \
- "$playuri" >"$statusfile" 2>/dev/null &
-
- # # MPlayer2:
- # nohup /usr/bin/mplayer -ao pulse \
- # --slave --input=file="$fifofile" \
- # --volume="$volume" \
- # "$playuri" >"$statusfile" 2>/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"