From ea6b0ee0fb488860a9f83202b42704592f8c716b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 21 Jan 2015 12:14:27 +0100
Subject: [PATCH] OO-697: call the player with the right parameters in
podcasts, more audio catch
---
.../olat/modules/webFeed/ui/podcast/_content/episode.html | 4 ++--
.../olat/modules/webFeed/ui/podcast/_content/episodes.html | 2 +-
src/main/webapp/static/movie/player.js | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
index 1ea51d6c931..aa0d92f617a 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
@@ -52,9 +52,9 @@
<script type="text/javascript">
/* <![CDATA[ */
#if ($!helper.getMediaType($item.getEnclosure()) == "video")
- BPlayer.insertPlayer("$!helper.getMediaUrl($item)","o_podcast_episode_$velocityCount",$!helper.getWidth($item),$!helper.getHeight($item),"video");
+ BPlayer.insertPlayer("$!helper.getMediaUrl($item)","o_podcast_episode_$velocityCount",$!helper.getWidth($item),$!helper.getHeight($item),false,null,"video");
#else
- BPlayer.insertPlayer("$!helper.getMediaUrl($item)","o_podcast_episode_$velocityCount",400,24,"sound");
+ BPlayer.insertPlayer("$!helper.getMediaUrl($item)","o_podcast_episode_$velocityCount",400,24,false,null,"sound");
#end
/* ]]> */
</script>
diff --git a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
index c18dd120d03..995adc9276c 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
@@ -78,7 +78,7 @@
#if ($!helper.getMediaType($episode.getEnclosure()) == "video")
BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_episode_$velocityCount",$!helper.getWidth($episode),$!helper.getHeight($episode),false,null,"video");
#else
- BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_episode_$velocityCount",400,24,"sound");
+ BPlayer.insertPlayer("$!helper.getMediaUrl($episode)","o_podcast_episode_$velocityCount",400,24,false,null,"sound");
#end
/* ]]> */
</script>
diff --git a/src/main/webapp/static/movie/player.js b/src/main/webapp/static/movie/player.js
index f5d1ed75360..7ed9a9397ae 100644
--- a/src/main/webapp/static/movie/player.js
+++ b/src/main/webapp/static/movie/player.js
@@ -154,6 +154,10 @@ var BPlayer = {
if(config.provider == 'sound') {
if(extension == 'mp3') {
mimeType = "audio/mp3";
+ } else if(extension == 'aac') {
+ mimeType = "audio/aac";
+ } else if(extension == 'm4a') {
+ mimeType = "audio/m4a";
}
} else if(config.provider == 'youtube') {
mimeType = "video/youtube";
@@ -191,7 +195,6 @@ var BPlayer = {
mimeType = "video/vimeo";
} else if(config.file.indexOf('youtube.com') > -1 || config.file.indexOf('youtube.be')) {
mimeType = "video/youtube";
-
} else {
alert('Something go badly wrong!' + config.provider + " " + extension);
}
--
GitLab