Author: andre
Date: 2010-06-21 13:32:45 +0200 (Mon, 21 Jun 2010)
New Revision: 42633
Modified:
openimages/trunk/src/main/webapp/WEB-INF/tags/oip/audio.tagx
openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
Log:
no codec if empty or unknown
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/audio.tagx
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/audio.tagx
2010-06-21 11:11:32 UTC (rev 42632)
+++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/audio.tagx
2010-06-21 11:32:45 UTC (rev 42633)
@@ -39,7 +39,13 @@
<mm:functioncontainer>
<mm:param name="format">MP3,OGG,OGA</mm:param>
<mm:listfunction name="filteredurls">
- <source src="${mm:escape('text/xml', _.URL)}" type="${_.mimeType};
codecs=${mm:escape('lowercase', _.codec)}" />
+ <c:choose>
+ <c:when test="${!empty _.codec and _.codec ne 'UNKNOWN'}">
+ <c:set var="codecs">; codecs=${mm:escape('lowercase',
_.codec)}</c:set>
+ </c:when>
+ <c:otherwise><c:set var="codecs" value="" /></c:otherwise>
+ </c:choose>
+ <source src="${mm:escape('text/xml', _.URL)}"
type="${_.mimeType}${codecs}" />
</mm:listfunction>
</mm:functioncontainer>
</mm:import>
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
2010-06-21 11:11:32 UTC (rev 42632)
+++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
2010-06-21 11:32:45 UTC (rev 42633)
@@ -46,9 +46,14 @@
<c:set var="codecs">${mm:escape('lowercase', _.codec)}</c:set>
</c:otherwise>
</c:choose> -->
- <c:set var="codecs">${mm:escape('lowercase', _.codec)}</c:set>
+ <c:choose>
+ <c:when test="${!empty _.codec and _.codec ne 'UNKNOWN'}">
+ <c:set var="codecs">; codecs=${mm:escape('lowercase',
_.codec)}</c:set>
+ </c:when>
+ <c:otherwise><c:set var="codecs" value="" /></c:otherwise>
+ </c:choose>
<source src="${mm:escape('text/xml', _.URL)}"
- type="${_.mimeType}; codecs=${codecs}" />
+ type="${_.mimeType}${codecs}" />
</mm:listfunction>
</mm:functioncontainer>
</mm:import>
@@ -70,7 +75,7 @@
controls="controls"
width="${w}"
height="${h}"
- poster="${poster}">
+ >
<mm:write referid="mediaurls" escape="none" />
<p class="oiplayer-warn">
You need a browser that understands the html5 video tag to play this
media item.
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
