[Toss-devel-svn] SF.net SVN: toss:[1655] trunk/Toss

[<luk...@us...>]

Revision: 1655
          http://toss.svn.sourceforge.net/toss/?rev=1655&view=rev
Author:   lukaszkaiser
Date:     2012-01-30 15:14:41 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Technical correction to make videos work on www.

Modified Paths:
--------------
    trunk/Toss/Learn/Makefile
    trunk/Toss/www/xsl/common.xsl

Added Paths:
-----------
    trunk/Toss/www/.htaccess

Modified: trunk/Toss/Learn/Makefile
===================================================================
--- trunk/Toss/Learn/Makefile	2012-01-24 14:43:58 UTC (rev 1654)
+++ trunk/Toss/Learn/Makefile	2012-01-30 15:14:41 UTC (rev 1655)
@@ -59,9 +59,17 @@
 %.webm:
 	ffmpeg -an -i videos/$(basename $@).3gp $@
 
+%.mp4:
+	ffmpeg -an -i videos/$(basename $@).3gp $@
+
+%.ogv: %.mp4
+	ffmpeg -an -i videos/$(basename $@).3gp $@
+
 VIDEOS_WEBM = $(addsuffix .webm, $(VIDEOS_BASE))
+VIDEOS_OGG = $(addsuffix .ogv, $(VIDEOS_BASE))
+VIDEOS_MP4 = $(addsuffix .mp4, $(VIDEOS_BASE))
 
-webms: $(VIDEOS_WEBM)
+webvideos: $(VIDEOS_WEBM) $(VIDEOS_MP4) $(VIDEOS_OGG)
 
 
 .PHONY: clean

Added: trunk/Toss/www/.htaccess
===================================================================
--- trunk/Toss/www/.htaccess	                        (rev 0)
+++ trunk/Toss/www/.htaccess	2012-01-30 15:14:41 UTC (rev 1655)
@@ -0,0 +1,3 @@
+AddType video/webm .webm
+AddType video/ogg  .ogv
+AddType video/mp4  .mp4

Modified: trunk/Toss/www/xsl/common.xsl
===================================================================
--- trunk/Toss/www/xsl/common.xsl	2012-01-24 14:43:58 UTC (rev 1654)
+++ trunk/Toss/www/xsl/common.xsl	2012-01-30 15:14:41 UTC (rev 1655)
@@ -112,8 +112,9 @@
 
 <xsl:template match="playvideo">
   <video width="352" height="288" controls="controls">
-    <source src="videos/{@name}.3gp" type="video/3gpp" />
+    <source src="videos/{@name}.mp4" type="video/mp4" />
     <source src="videos/{@name}.webm" type="video/webm" />
+    <source src="videos/{@name}.ogv" type="video/ogg" />
     Your browser does not support the video tag.
   </video>
   <a href="videos/{@name}.txt">Text</a>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.