From ec9b7649670df61b7402a41e7c7ec3cec3edaf9b Mon Sep 17 00:00:00 2001 From: erlehmann Date: Sun, 2 Mar 2008 09:56:02 +0000 Subject: [PATCH] this doesn't work i know it git-svn-id: http://yolanda.mister-muffin.de/svn@242 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/functions.pl | 3 +- trunk/images/agplv3-155x51.png | Bin 0 -> 4547 bytes trunk/style/default.css | 3 + trunk/tools/daemon.pl | 4 +- trunk/xsl/xhtml.xsl | 28 ++++----- trunk/xsl/xhtml/video.xsl | 101 ++++++++++++++++++++++++++++----- 6 files changed, 110 insertions(+), 29 deletions(-) create mode 100644 trunk/images/agplv3-155x51.png diff --git a/trunk/functions.pl b/trunk/functions.pl index 81c0087..801340a 100644 --- a/trunk/functions.pl +++ b/trunk/functions.pl @@ -186,7 +186,8 @@ sub output_page #send everything including http headers to the user - if xslt chosen is xspf set download filename return $session->header( - -type=>'text/xml', + -type=>'application/xhtml+xml', + # fix the MIME type so that every XSLT works again -charset=>'UTF-8', -cookie=>@cookies ), diff --git a/trunk/images/agplv3-155x51.png b/trunk/images/agplv3-155x51.png new file mode 100644 index 0000000000000000000000000000000000000000..85a4add7d8c767447d987329fc1d754c96f07322 GIT binary patch literal 4547 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 literal 0 HcmV?d00001 diff --git a/trunk/style/default.css b/trunk/style/default.css index 6e1c867..8272e53 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -137,12 +137,15 @@ a border-width: 1px; } +/* div.footer { position: absolute; bottom: 1.5em; margin-right: 1.5em; } +*/ + img.logo-header { display: none; diff --git a/trunk/tools/daemon.pl b/trunk/tools/daemon.pl index 8737ea0..496d4b0 100755 --- a/trunk/tools/daemon.pl +++ b/trunk/tools/daemon.pl @@ -178,7 +178,7 @@ while(1) $vwidth = int($vheight*($width/$height)/8 + .5)*8; $abitrate = 64; - $vbitrate = int($filesize*8) / $duration + .5) - $abitrate; + $vbitrate = int(($filesize*8) / $duration + .5) - $abitrate; #TODO: add metadata information system "ffmpeg2theora --optimize --videobitrate $vbitrate --audiobitrate $abitrate --sharpness 0 --width $vwidth --height $vheight --output $root/videos/$id /tmp/$id"; @@ -208,7 +208,7 @@ while(1) } else { - TODO: maybe make this event-driven by using the kernels has-this-file-changed-interface ? + #TODO: maybe make this event-driven by using the kernels has-this-file-changed-interface ? sleep 10; } } diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 90be52d..79b2f1b 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -17,14 +17,15 @@ omit-xml-declaration="no" /> + + + + - - - @@ -51,11 +52,16 @@ + + + + + - + @@ -63,7 +69,7 @@ - + +
@@ -208,7 +208,9 @@ + @@ -293,7 +295,7 @@ - +
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index d159061..2ad8b56 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -9,6 +9,7 @@ + + + + +