From d14ee4f0db7ffc10c2e20e9e93448d4054708280 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Tue, 7 Jan 2014 11:32:48 -0600 Subject: [PATCH] Add mediaelement player --- lib/get-info.js | 11 +- www/assets/js/callbacks.js | 11 +- www/assets/js/player.js | 68 +- www/assets/mediaelement/background.png | Bin 0 -> 166 bytes www/assets/mediaelement/bigplay.png | Bin 0 -> 3001 bytes www/assets/mediaelement/bigplay.svg | 1 + www/assets/mediaelement/controls-ted.png | Bin 0 -> 1559 bytes www/assets/mediaelement/controls-wmp-bg.png | Bin 0 -> 1960 bytes www/assets/mediaelement/controls-wmp.png | Bin 0 -> 5511 bytes www/assets/mediaelement/controls.png | Bin 0 -> 1892 bytes www/assets/mediaelement/controls.svg | 1 + .../mediaelement/flashmediaelement-cdn.swf | Bin 0 -> 29149 bytes www/assets/mediaelement/flashmediaelement.swf | Bin 0 -> 29142 bytes www/assets/mediaelement/jquery.js | 9597 +++++++++++++++++ www/assets/mediaelement/loading.gif | Bin 0 -> 6224 bytes .../mediaelement/mediaelement-and-player.js | 5097 +++++++++ .../mediaelement-and-player.min.js | 174 + www/assets/mediaelement/mediaelement.js | 1932 ++++ www/assets/mediaelement/mediaelement.min.js | 69 + .../mediaelement/mediaelementplayer.css | 870 ++ www/assets/mediaelement/mediaelementplayer.js | 3163 ++++++ .../mediaelement/mediaelementplayer.min.css | 1 + .../mediaelement/mediaelementplayer.min.js | 103 + www/assets/mediaelement/mejs-skins.css | 289 + .../mediaelement/silverlightmediaelement.xap | Bin 0 -> 12461 bytes www/channel.html | 2 + 26 files changed, 21382 insertions(+), 7 deletions(-) create mode 100644 www/assets/mediaelement/background.png create mode 100644 www/assets/mediaelement/bigplay.png create mode 100644 www/assets/mediaelement/bigplay.svg create mode 100644 www/assets/mediaelement/controls-ted.png create mode 100644 www/assets/mediaelement/controls-wmp-bg.png create mode 100644 www/assets/mediaelement/controls-wmp.png create mode 100644 www/assets/mediaelement/controls.png create mode 100644 www/assets/mediaelement/controls.svg create mode 100755 www/assets/mediaelement/flashmediaelement-cdn.swf create mode 100644 www/assets/mediaelement/flashmediaelement.swf create mode 100644 www/assets/mediaelement/jquery.js create mode 100644 www/assets/mediaelement/loading.gif create mode 100644 www/assets/mediaelement/mediaelement-and-player.js create mode 100644 www/assets/mediaelement/mediaelement-and-player.min.js create mode 100644 www/assets/mediaelement/mediaelement.js create mode 100644 www/assets/mediaelement/mediaelement.min.js create mode 100644 www/assets/mediaelement/mediaelementplayer.css create mode 100644 www/assets/mediaelement/mediaelementplayer.js create mode 100644 www/assets/mediaelement/mediaelementplayer.min.css create mode 100644 www/assets/mediaelement/mediaelementplayer.min.js create mode 100644 www/assets/mediaelement/mejs-skins.css create mode 100644 www/assets/mediaelement/silverlightmediaelement.xap diff --git a/lib/get-info.js b/lib/get-info.js index 0952f310..8329b27a 100644 --- a/lib/get-info.js +++ b/lib/get-info.js @@ -716,9 +716,16 @@ function VimeoIsADoucheCopter(id, cb) { json = JSON.parse(json); var codec = json.request.files.codecs[0]; var files = json.request.files[codec]; - cb(files); + setImmediate(function () { + cb(files); + }); } catch (e) { - cb({}); + Logger.errlog.log("Vimeo workaround error: "); + Logger.errlog.log(e); + Logger.errlog.log(data); + setImmediate(function () { + cb({}); + }); } }; diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 826797ad..cd36f2fa 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -1030,11 +1030,16 @@ Callbacks = { $("
").attr("id", "ytapiplayer") .insertBefore($("#ytapiplayer_wrapper")); $("#ytapiplayer_wrapper").remove(); + } else if(data.type != "me" && PLAYER.type == "me") { + var mejs = $(".mejs-container"); + $("
").attr("id", "ytapiplayer") + .insertBefore(mejs[0]); + mejs.remove(); } - if (data.type === "vi" && data.direct) { - data.type = "jw"; - data.id = data.direct.sd.url; + if (data.type === "vi" && data.direct && data.direct.sd) { + data.type = "me"; + data.url = data.direct.sd.url; } if (data.type != PLAYER.type) { diff --git a/www/assets/js/player.js b/www/assets/js/player.js index 0e8be01f..c59e2d73 100644 --- a/www/assets/js/player.js +++ b/www/assets/js/player.js @@ -1,4 +1,4 @@ -/* +/*} The MIT License (MIT) Copyright (c) 2013 Calvin Montgomery @@ -990,6 +990,70 @@ var GoogleDocsPlayer = function (data) { self.init(data); }; +function MediaElementsPlayer(data) { + var self = this; + self.init = function (data) { + waitUntilDefined(window, "MediaElementPlayer", function () { + self.videoId = data.id; + self.videoURL = data.url; + var video = $("