]> git.plutz.net Git - serve0/commitdiff
urlsave raspi links experimenting...
authorpaul <paul@plutz.net>
Fri, 24 Apr 2015 14:44:14 +0000 (14:44 +0000)
committerpaul <paul@plutz.net>
Fri, 24 Apr 2015 14:44:14 +0000 (14:44 +0000)
svn path=/trunk/; revision=43

pages/videoview.sh

index e207c7cb343b153f597496b392789157ae9e7cc9..913b15b95181bfe134a5051f9a7dfa28feb73ab7 100755 (executable)
@@ -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