From dc3efd94c81731f266111672bbc51a5670a917ac Mon Sep 17 00:00:00 2001 From: calzoneman Date: Wed, 13 Aug 2014 13:51:09 -0500 Subject: [PATCH] Remove JustinTV support as it is no longer in service --- lib/get-info.js | 14 -------------- lib/utilities.js | 3 --- www/js/player.js | 50 ------------------------------------------------ www/js/util.js | 9 --------- 4 files changed, 76 deletions(-) diff --git a/lib/get-info.js b/lib/get-info.js index 4f89e0fd..0ae25e13 100644 --- a/lib/get-info.js +++ b/lib/get-info.js @@ -575,20 +575,6 @@ var Getters = { callback(false, media); }, - /* justin.tv */ - jt: function (id, callback) { - var m = id.match(/([\w-]+)/); - if (m) { - id = m[1]; - } else { - callback("Invalid ID", null); - return; - } - var title = "Justin.tv - " + id; - var media = new Media(id, title, "--:--", "jt"); - callback(false, media); - }, - /* ustream.tv */ us: function (id, callback) { /** diff --git a/lib/utilities.js b/lib/utilities.js index c62c2428..9990e6f8 100644 --- a/lib/utilities.js +++ b/lib/utilities.js @@ -251,8 +251,6 @@ return "http://livestream.com/" + id; case "tw": return "http://twitch.tv/" + id; - case "jt": - return "http://justin.tv/" + id; case "rt": return id; case "jw": @@ -274,7 +272,6 @@ switch (type) { case "li": case "tw": - case "jt": case "us": case "rt": case "cu": diff --git a/www/js/player.js b/www/js/player.js index 3128c629..23bee7a5 100644 --- a/www/js/player.js +++ b/www/js/player.js @@ -628,55 +628,6 @@ var TwitchTVPlayer = function (data) { }); }; -var JustinTVPlayer = function (data) { - removeOld(); - var self = this; - self.videoId = data.id; - self.videoLength = data.seconds; - self.init = function () { - var prto = location.protocol; - var url = "http://www.justin.tv/widgets/live_embed_player.swf?channel="+self.videoId; - var params = { - allowFullScreen: "true", - allowScriptAccess: "always", - allowNetworking: "all", - movie: "http://www.justin.tv/widgets/live_embed_player.swf", - id: "live_embed_player_flash", - flashvars: "hostname=www.justin.tv&channel="+self.videoId+"&auto_play=true&start_volume=" + VOLUME - }; - swfobject.embedSWF(url, - "ytapiplayer", - VWIDTH, VHEIGHT, - "8", - null, null, - params, - {} - ); - }; - - self.load = function (data) { - self.videoId = data.id; - self.videoLength = data.seconds; - self.init(); - }; - - self.pause = function () { }; - - self.play = function () { }; - - self.getTime = function () { }; - - self.seek = function () { }; - - self.getVolume = function () { }; - - self.setVolume = function () { }; - - waitUntilDefined(window, "swfobject", function () { - self.init(); - }); -}; - function rtmpEventHandler(id, ev, data) { if (ev === "volumechange") { PLAYER.volume = (data.muted ? 0 : data.volume); @@ -1236,7 +1187,6 @@ var constructors = { "sc": SoundcloudPlayer, "li": LivestreamPlayer, "tw": TwitchTVPlayer, - "jt": JustinTVPlayer, "us": UstreamPlayer, "jw": JWPlayer, "im": ImgurPlayer, diff --git a/www/js/util.js b/www/js/util.js index 87b7ab83..ee714824 100644 --- a/www/js/util.js +++ b/www/js/util.js @@ -46,8 +46,6 @@ function formatURL(data) { return "http://livestream.com/" + data.id; case "tw": return "http://twitch.tv/" + data.id; - case "jt": - return "http://justin.tv/" + data.id; case "rt": return data.id; case "jw": @@ -1234,13 +1232,6 @@ function parseMediaLink(url) { }; } - if((m = url.match(/justin\.tv\/([^&#]+)/))) { - return { - id: m[1], - type: "jt" - }; - } - if((m = url.match(/livestream\.com\/([^\?&#]+)/))) { return { id: m[1],