From: paul <paul@plutz.net>
Date: Fri, 24 Apr 2015 14:44:14 +0000 (+0000)
Subject: urlsave raspi links experimenting...
X-Git-Url: http://git.plutz.net/?p=serve0;a=commitdiff_plain;h=58aaaf4ab3c2869c2f8cd52c8b44af7cd28fbdec

urlsave raspi links experimenting...

svn path=/trunk/; revision=43
---

diff --git a/pages/videoview.sh b/pages/videoview.sh
index e207c7c..913b15b 100755
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -96,12 +96,12 @@ _printVideo(){
     linkinfo="$(urlsave "$info")"
 
     rpiaddr="$(host pfostenpanne |sed -r 's;^.* ([0-9\.]+)$;\1;')"
-    rpibase="http://${rpiaddr}/?path=http://jupiter:8000/"
-    rpicgi="http://${rpiaddr}/?path=$(urlsave "http://jupiter:8000/?action=transcode&t=480&i=")"
+    rpidull="http://${rpiaddr}/?path=http://jupiter:8000/${video}"
+    rpicgi="http://${rpiaddr}/?path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
 
     [ $height -gt 480 ] && \
-       raspi="<a class=\"videolink alt raspi\" href=\"${rpicgi}${linkinfo}\">RasPi</a>" \
-    || raspi="<a class=\"videolink alt raspi\" href=\"${rpibase}${video}\">RasPi</a>"
+       raspi="<a class=\"videolink alt raspi\" href=\"${rpicgi}\">RasPi</a>" \
+    || raspi="<a class=\"videolink alt raspi\" href=\"${rpidull}\">RasPi</a>"
     [ $height -gt 480 ] && \
       alt480="<a class=\"videolink alt 480p\" href=\"?action=transcode&i=${linkinfo}&t=480\">480p</a>" \
     ||unset alt480