diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rwxr-xr-x | templates/bin/ruutu-dl | 4 | ||||
| -rw-r--r-- | templates/ruutufi/video.xsl | 6 |
3 files changed, 8 insertions, 3 deletions
@@ -196,3 +196,4 @@ Video site modules: 2010-xx-xx: Version 0.3.2 - New video service: MoonTV (contributed by Matti Lehtimäki) +- ruutu.fi uses rtmpe for some videos diff --git a/templates/bin/ruutu-dl b/templates/bin/ruutu-dl index be8d01e..9953bf3 100755 --- a/templates/bin/ruutu-dl +++ b/templates/bin/ruutu-dl @@ -17,7 +17,7 @@ else fi if [ "x$RTMPDUMP" = "x" ]; then - echo "ERROR: neither rtmpdump nor rtmpdump-yle not on \$PATH" 1>&2 + echo "ERROR: neither rtmpdump nor rtmpdump-yle on \$PATH" 1>&2 exit 1 fi @@ -31,6 +31,6 @@ if [ "x$2" = "x" ]; then exit 1 fi -$RTMPDUMP -r $1 -q --swfUrl http://n.sestatic.fi/sites/all/modules/media/Nelonen_mediaplayer_4.6.swf --pageUrl $2 -o - +$RTMPDUMP -q -r "$1" -W http://n.sestatic.fi/sites/all/modules/media/Nelonen_mediaplayer_5.1.3.swf -p "$2" -o - exit $? diff --git a/templates/ruutufi/video.xsl b/templates/ruutufi/video.xsl index e6af547..a0d212b 100644 --- a/templates/ruutufi/video.xsl +++ b/templates/ruutufi/video.xsl @@ -10,7 +10,11 @@ <title><xsl:value-of select="concat(/Playerdata/Behavior/Program/@program_name, ' ', /Playerdata/Behavior/Program/@episode_name)"/></title> <xsl:choose> - <xsl:when test="starts-with(/Playerdata/Clip/SourceFile, 'rtmp://')"> + <xsl:when test="starts-with(/Playerdata/Clip/SourceFile, 'rtmp://') or + starts-with(/Playerdata/Clip/SourceFile, 'rtmpe://') or + starts-with(/Playerdata/Clip/SourceFile, 'rtmpt://') or + starts-with(/Playerdata/Clip/SourceFile, 'rtmpte://') or + starts-with(/Playerdata/Clip/SourceFile, 'rtmps://')"> <url priority="50">wvt:///bin/ruutu-dl?contenttype=video/x-flv&arg=<xsl:value-of select="str:encode-uri(/Playerdata/Clip/SourceFile, true())"/>&arg=http://www.ruutu.fi/video</url> </xsl:when> <xsl:otherwise> |