[Openutils-svn] SF.net SVN: openutils:[1746] trunk/openutils-mgnlmedia/src/main/resources

[<die...@us...>]

Revision: 1746
          http://openutils.svn.sourceforge.net/openutils/?rev=1746&view=rev
Author:   diego_schivo
Date:     2010-02-01 16:00:30 +0000 (Mon, 01 Feb 2010)

Log Message:
-----------
MEDIA-59 added JW Player 5

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/player.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/yt.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/player.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/yt.swf

Removed Paths:
-------------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/player.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/yt.swf

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-01 15:39:50 UTC (rev 1745)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-01 16:00:30 UTC (rev 1746)
@@ -5,6 +5,7 @@
   <jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
   <jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
   <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node "/>
+  <jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description=""/>
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
   <jsp:directive.attribute name="useEm" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true, and ignoreDimensions is not true it will apply style attribute on img tags with sidth and height in 'em'. the em values will be computed using as width in pixel * emRatio (see next attribute)"/>
@@ -37,6 +38,9 @@
   <c:if test="${empty emRatio }">
     <c:set var="emRatio" value="${1.0 }" />
   </c:if>
+  <c:if test="${empty player}">
+    <c:set var="player" value="${pageContext.request.contextPath}/.resources/media/players/jw-player-4/player.swf" />
+  </c:if>
   <c:set value="${media:node(item)}" var="mediaNode" />
   <c:choose>
     <c:when test="${!empty mediaNode}">
@@ -110,7 +114,7 @@
           </c:if>
         </c:when>
         <c:when test="${media.type eq 'video' or media.type eq 'audio' }">
-          <media:player share="${share}" item="${item}" width="${width}" height="${height}"  autoPlay="${autoPlay}" loop="${loop}"  thumbnail="${thumbnail}"  noPlayIcon="${noPlayIcon}" controlBar="${controlBar}" skin="${skin}"/>
+          <media:player player="${player}" share="${share}" item="${item}" width="${width}" height="${height}"  autoPlay="${autoPlay}" loop="${loop}"  thumbnail="${thumbnail}"  noPlayIcon="${noPlayIcon}" controlBar="${controlBar}" skin="${skin}"/>
         </c:when>
         <c:when test="${media.type eq 'youtube'}">
           <c:set var="url" value="${media:url(mediaNode)}" />
@@ -142,7 +146,7 @@
           </c:set>
           <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
           <c:if test="${!empty(url)}">
-            <media:swfobject width="${width}" height="${height}" allowfullscreen="true" allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
+            <media:swfobject player="${player}" width="${width}" height="${height}" allowfullscreen="true" allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
           </c:if>
         </c:when>
       </c:choose>

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2010-02-01 15:39:50 UTC (rev 1745)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2010-02-01 16:00:30 UTC (rev 1746)
@@ -4,6 +4,7 @@
   xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8"/>
   <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node "/>
+  <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description=""/>
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
   <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true the img element will be rendered without width and height attributes "/>
@@ -67,7 +68,7 @@
           <![CDATA[&amp;sharing.code=${fn:escapeXml(sharingcode)}]]>
         </c:if>
       </c:set>
-      <media:swfobject width="${width}" height="${height}" allowfullscreen="true" allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
+      <media:swfobject player="${player}" width="${width}" height="${height}" allowfullscreen="true" allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
     </c:if>
     <c:if test="${su:endsWith(fn:toLowerCase(url), 'swf')}">
       <media:swfobject player="${pageContext.request.contextPath}${url}" width="${width}" height="${height}" />

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2010-02-01 15:39:50 UTC (rev 1745)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2010-02-01 16:00:30 UTC (rev 1746)
@@ -3,17 +3,14 @@
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:directive.tag description="" pageEncoding="UTF-8" />
-  <jsp:directive.attribute name="player" required="false" rtexprvalue="true" />
+  <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
+    description="" />
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
     description="flash content width" />
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
     description="flash content height" />
   <jsp:directive.tag dynamic-attributes="attrs" />
 
-  <c:if test="${empty player}">
-    <c:set var="player" value="${pageContext.request.contextPath}/.resources/media/players/player.swf" />
-  </c:if>
-
   <c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
   <div id="${previewId}" class="preview"><!-- -->
   </div>

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/player.swf
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/player.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/yt.swf
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-4/yt.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/player.swf
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/player.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/yt.swf
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jw-player-5/yt.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/player.swf
===================================================================
(Binary files differ)

Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/yt.swf
===================================================================
(Binary files differ)


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