diff --git a/resources/embed/embed.js b/resources/embed/embed.js
--- a/resources/embed/embed.js
+++ b/resources/embed/embed.js
#
@@ -101,11 +101,6 @@ function guessMimeFromUrl(vidurl){
#
- // videojs can't handle these. VID-5 implements support
#
- return 'special/m3uplaylist';
#
console.log("Calculating mimetime failed for " + vidurl + " ext: " + ext.toLowerCase());
#
@@ -250,24 +245,13 @@ function writePlayer(vidid,playerSettings){
#
v.setAttribute('width',width);
#
// now create the source
#
- if (window.playerSettings['vidtype'] != "special/m3uplaylist"){
#
- var src = cE('source');
#
- src.setAttribute('src',playerSettings['vidurl']);
#
- src.setAttribute('type',playerSettings['vidtype']);
#
- pllist.className = "vjs-playlist"; // This will need changing later to allow multiple players on one page
#
- v.appendChild(pllist);
#
- plliststl = cE('link');
#
- plliststl.setAttribute('rel','stylesheet');
#
- plliststl.setAttribute('href',window.BensPD +'resources/js/playlist-ui/videojs-playlist-ui.vertical.css');
#
- document.getElementsByTagName('head')[0].appendChild(plliststl);
#
+ var src = cE('source');
#
+ src.setAttribute('src',playerSettings['vidurl']);
#
+ src.setAttribute('type',playerSettings['vidtype']);
#
+ // Stitch everything together
#
@@ -279,59 +263,6 @@ function writePlayer(vidid,playerSettings){
#
- if (window.playerSettings['vidtype'] == "special/m3uplaylist"){
#
- // Initialise the playlist-ui plugin against the player
#
- var s = cE('script');
#
- s.setAttribute('type','text/javascript');
#
- ss = "window.player" + vidid +".playlistUi();";
#
- // Add Next/Previous controls to the player's control bar
#
- var s = cE('script');
#
- s.innerHTML = 'var VjsButton = videojs.getComponent("Button"); \
#
- var nextButton = videojs.extend(VjsButton, { \
#
- constructor: function(player, options){ \
#
- VjsButton.call(this, player, options); \
#
- this.controlText("Next"); \
#
- handleClick: function() { \
#
- window.player'+ vidid + '.playlist.next(); \
#
- buildCSSClass: function() { \
#
- return "vjs-icon-next-item vjs-control vjs-button"; \
#
- var prevButton = videojs.extend(VjsButton, { \
#
- constructor: function(player, options){ \
#
- VjsButton.call(this, player, options); \
#
- this.controlText("Previous"); \
#
- handleClick: function() { \
#
- window.player'+ vidid + '.playlist.previous(); \
#
- buildCSSClass: function() { \
#
- return "vjs-icon-previous-item vjs-control vjs-button"; \
#
- videojs.registerComponent("prevButton", prevButton); \
#
- videojs.registerComponent("NextButton", nextButton); \
#
- window.player'+ vidid + '.getChild("controlBar").addChild("prevButton", {}); \
#
- window.player'+ vidid + '.getChild("controlBar").addChild("nextButton", {});';
#
- // The player now exists, so we need to build the playlist
#
- fetchM3U(playerSettings['vidurl'],vidid);
#
// VID-9 check for metadata and write schema.org markup if it exists
#
dirname = playerSettings['vidurl'].match(/.*\//);
#
fetchPage(dirname + 'details.json',BenswriteSchemaOrg,function(e){},playerSettings);
#
@@ -346,9 +277,6 @@ function loadVJS(vidid,playerSettings){
#
if (window.playerSettings['vidtype'] == "application/x-mpegURL"){
#
e.onload = function () { loadVJSHLS(vidid,playerSettings); };
#
- }else if (window.playerSettings['vidtype'] == "special/m3uplaylist"){
#
- e.onload = function () { loadVJSM3U(vidid,playerSettings); };
#
e.onload = function () { writePlayer(vidid,playerSettings); };
#
@@ -357,27 +285,6 @@ function loadVJS(vidid,playerSettings){
#
-function loadVJSM3U(vidid,playerSettings){
#
- var c = document.getElementById('BensplayerWrapper'+vidid);
#
- var e = cE('script');
#
- e.setAttribute('type','text/javascript');
#
- e.setAttribute('src',window.BensPD + 'resources/js/playlist/videojs-playlist.js');
#
- e.onload = function () {
#
- * Disabled for now, because we lack the necessary information in most M3Us. Leaving here for reference later
#
- plui.setAttribute('type','text/javascript');
#
- plui.setAttribute('src',window.BensPD +'resources/js/playlist-ui/videojs-playlist-ui.min.js');
#
- document.getElementsByTagName('head')[0].appendChild(plui);
#
- writePlayer(vidid,playerSettings);
#
function loadVJSHLS(vidid,playerSettings){
#
var c = document.getElementById('BensplayerWrapper'+vidid);
#
@@ -412,63 +319,6 @@ function fetchPage(url,callback,errcallback,storage){
#
-function fetchM3U(vidurl,vidid){
#
- window.videoListid = vidid; // This'll prevent multi-player support for M3Us, but that can be fixed later
#
- var oReq = new XMLHttpRequest();
#
- oReq.addEventListener("load", parseM3U);
#
- oReq.open("GET", vidurl);
#
- window.videoList = [];
#
- lines = this.responseText.split('\n');
#
- domain = window.location.hostname;
#
- for (var i=0; i<lines.length; i++){
#
- if (lines[i][0] == "#" || lines[i] == ""){
#
- // It's a comment/metadata, skip
#
- segs = lines[i].split(".")
#
- ext = segs[segs.length - 1].toLowerCase()
#
- // Don't include M3Us, the player will bork
#
- if (lines[i][0] == "/"){
#
- // relative URL, prepend the current domain
#
- // Todo: should really make this the domain of the playlist
#
- playpath = 'https://'+domain+lines[i];
#
- type: guessMimeFromUrl(lines[i])
#
- window.videoList.push(o);
#
- vidid = window.videoListid;
#
- var s = cE('script');
#
- s.setAttribute('type','text/javascript');
#
- ss = "window.player" + vidid +".playlist(window.videoList); window.player" + vidid +".playlist.autoadvance(0);window.player" + vidid +".playlist.first();";
#
- var c = document.getElementById('BensVideo'+vidid);
#
function embedFailedNotif(vidid){