Skip to content
Snippets Groups Projects
Commit f6b1d011 authored by srosse's avatar srosse
Browse files

OO-697: fix issues with mp3 playback, made aac works for IE

parent d2da1cec
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ class TextElementRenderer extends DefaultComponentRenderer { ...@@ -90,7 +90,7 @@ class TextElementRenderer extends DefaultComponentRenderer {
//read only view //read only view
sb.append("<span id=\"").append(id).append("\" ") sb.append("<span id=\"").append(id).append("\" ")
.append(FormJSHelper.getRawJSFor(te.getRootForm(), id, te.getAction())) .append(FormJSHelper.getRawJSFor(te.getRootForm(), id, te.getAction()))
.append("title=\"").append(htmlVal) //the uncutted value in tooltip .append(" title=\"").append(htmlVal) //the uncutted value in tooltip
.append("\" ").append(" >"); .append("\" ").append(" >");
// use the longer from display size or real value length // use the longer from display size or real value length
int size = (te.displaySize > value.length() ? te.displaySize : value.length()); int size = (te.displaySize > value.length() ? te.displaySize : value.length());
......
...@@ -53,6 +53,7 @@ import org.olat.core.helpers.Settings; ...@@ -53,6 +53,7 @@ import org.olat.core.helpers.Settings;
import org.olat.core.logging.OLog; import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.core.util.ArrayHelper; import org.olat.core.util.ArrayHelper;
import org.olat.core.util.CodeHelper;
import org.olat.core.util.Formatter; import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.core.util.filter.Filter; import org.olat.core.util.filter.Filter;
...@@ -109,6 +110,10 @@ public class VelocityRenderDecorator implements Closeable { ...@@ -109,6 +110,10 @@ public class VelocityRenderDecorator implements Closeable {
sb.append("o_s").append(prefix).append(vc.getDispatchID()); sb.append("o_s").append(prefix).append(vc.getDispatchID());
return StringOutputPool.freePop(sb); return StringOutputPool.freePop(sb);
} }
public String getUniqueId() {
return Long.toString(CodeHelper.getRAMUniqueID());
}
/** /**
* *
......
...@@ -58,13 +58,12 @@ ...@@ -58,13 +58,12 @@
</div> </div>
<div class="o_content"> <div class="o_content">
$!helper.getItemDescriptionForBrowser($episode) $!helper.getItemDescriptionForBrowser($episode)
#set($podId = $r.getUniqueId())
#if ($!episode.getEnclosure()) #if ($!episode.getEnclosure())
<div class="o_block_large_top"> <div class="o_block_large_top">
<div id="o_podcast_episode_$velocityCount" name="o_podcast_episode_$velocityCount" class="o_podcast_$!helper.getMediaType($episode.getEnclosure())" > <div id="o_podcast_${podId}_episode" class="o_podcast_$!helper.getMediaType($episode.getEnclosure())"></div>
<a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this media file.
</div>
<div class="o_block_top"> <div class="o_block_top">
<a href="$!helper.getMediaUrl($episode)" target="_blank"> <a href="$!helper.getMediaUrl($episode)" target="_blank">
...@@ -76,9 +75,9 @@ ...@@ -76,9 +75,9 @@
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
#if ($!helper.getMediaType($episode.getEnclosure()) == "video") #if ($!helper.getMediaType($episode.getEnclosure()) == "video")
BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_episode_$velocityCount",$!helper.getWidth($episode),$!helper.getHeight($episode),false,null,"video"); BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_${podId}_episode",$!helper.getWidth($episode),$!helper.getHeight($episode),false,null,"video");
#else #else
BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_episode_$velocityCount",400,24,false,null,"sound"); BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_${podId}_episode",400,24,false,null,"sound");
#end #end
/* ]]> */ /* ]]> */
</script> </script>
......
...@@ -126,8 +126,6 @@ var BPlayer = { ...@@ -126,8 +126,6 @@ var BPlayer = {
pluginPath: mediaElementBaseUrl, pluginPath: mediaElementBaseUrl,
flashName: 'flashmediaelement.swf', flashName: 'flashmediaelement.swf',
silverlightName: 'silverlightmediaelement.xap', silverlightName: 'silverlightmediaelement.xap',
loop: config.repeat,
pauseOtherPlayers: true,
success: function(mediaElement, originalNode, player) { success: function(mediaElement, originalNode, player) {
if(config.autostart) { if(config.autostart) {
try { try {
...@@ -156,6 +154,7 @@ var BPlayer = { ...@@ -156,6 +154,7 @@ var BPlayer = {
mimeType = "audio/mp3"; mimeType = "audio/mp3";
} else if(extension == 'aac') { } else if(extension == 'aac') {
mimeType = "audio/aac"; mimeType = "audio/aac";
meConfig.pluginVars = 'isvideo=true';
} else if(extension == 'm4a') { } else if(extension == 'm4a') {
mimeType = "audio/m4a"; mimeType = "audio/m4a";
} }
...@@ -185,6 +184,7 @@ var BPlayer = { ...@@ -185,6 +184,7 @@ var BPlayer = {
} else if(extension == 'aac') { } else if(extension == 'aac') {
mimeType = "audio/aac"; mimeType = "audio/aac";
config.provider = "sound"; config.provider = "sound";
meConfig.pluginVars = 'isvideo=true';
} else if(extension == 'mp3') { } else if(extension == 'mp3') {
mimeType = "audio/mp3"; mimeType = "audio/mp3";
config.provider = "sound"; config.provider = "sound";
...@@ -210,8 +210,7 @@ var BPlayer = { ...@@ -210,8 +210,7 @@ var BPlayer = {
if(config.width) { if(config.width) {
meConfig.audioWidth = config.width; meConfig.audioWidth = config.width;
} }
content = "<audio id='" + mediaDomId + "' controls='controls' preload='none'>"; content = "<audio id='" + mediaDomId + "' controls='controls' type='" +mimeType + "' src='" + config.file + "'></audio>";
content += "<source type='" +mimeType + "' src='" + config.file + "' /></audio>";
} else { } else {
//controls are mandatory for Safari at least //controls are mandatory for Safari at least
content = "<video id='" + mediaDomId + "' controls='controls' preload='none'"; content = "<video id='" + mediaDomId + "' controls='controls' preload='none'";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment