rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fix leader not working

Browse source
This commit is contained in:
Calvin Montgomery 2013-08-05 23:30:16 -04:00
parent d1d7c8dd05
commit 6bd44fa109
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/assets/js/player.js
View file

@ -38,10 +38,9 @@ var YouTubePlayer = function (data) {
rel: 0 // No related videos rel: 0 // No related videos
}, },
events: { events: {
onReady: function() { onReady: function () {
//socket.emit("playerReady");
}, },
onStateChange: function(ev) { onStateChange: function (ev) {
if(PLAYER.paused && ev.data != YT.PlayerState.PAUSED || if(PLAYER.paused && ev.data != YT.PlayerState.PAUSED ||
!PLAYER.paused && ev.data == YT.PlayerState.PAUSED) { !PLAYER.paused && ev.data == YT.PlayerState.PAUSED) {
self.paused = (ev.data == YT.PlayerState.PAUSED); self.paused = (ev.data == YT.PlayerState.PAUSED);
@ -115,7 +114,6 @@ var VimeoPlayer = function (data) {
iframe.css("border", "none"); iframe.css("border", "none");
$f(iframe[0]).addEvent("ready", function () { $f(iframe[0]).addEvent("ready", function () {
//socket.emit("playerReady");
self.player = $f(iframe[0]); self.player = $f(iframe[0]);
self.player.api("play"); self.player.api("play");
@ -211,7 +209,6 @@ var VimeoFlashPlayer = function (data) {
self.player = $("#ytapiplayer")[0]; self.player = $("#ytapiplayer")[0];
waitUntilDefined(self.player, "api_addEventListener", function () { waitUntilDefined(self.player, "api_addEventListener", function () {
self.player.api_addEventListener("ready", function () { self.player.api_addEventListener("ready", function () {
//socket.emit("playerReady");
self.player.api_play(); self.player.api_play();
self.player.api_addEvent("finish", function () { self.player.api_addEvent("finish", function () {
@ -281,7 +278,6 @@ var DailymotionPlayer = function (data) {
}); });
self.player.addEventListener("apiready", function (e) { self.player.addEventListener("apiready", function (e) {
//socket.emit("playerReady");
self.player.addEventListener("ended", function (e) { self.player.addEventListener("ended", function (e) {
if(CLIENT.leader) { if(CLIENT.leader) {
socket.emit("playNext"); socket.emit("playNext");
@ -349,7 +345,6 @@ var SoundcloudPlayer = function (data) {
self.player = SC.Widget("ytapiplayer"); self.player = SC.Widget("ytapiplayer");
self.player.bind(SC.Widget.Events.READY, function () { self.player.bind(SC.Widget.Events.READY, function () {
//socket.emit("playerReady");
self.player.load(self.videoId, { auto_play: true }); self.player.load(self.videoId, { auto_play: true });
self.player.bind(SC.Widget.Events.PAUSE, function () { self.player.bind(SC.Widget.Events.PAUSE, function () {

4
www/assets/js/util.js
View file

@ -1139,9 +1139,9 @@ function parseMediaLink(url) {
} }
function sendVideoUpdate() { function sendVideoUpdate() {
PLAYER.getTime(function(seconds) { PLAYER.getTime(function (seconds) {
socket.emit("mediaUpdate", { socket.emit("mediaUpdate", {
id: PLAYER.id, id: PLAYER.videoId,
currentTime: seconds, currentTime: seconds,
paused: PLAYER.paused, paused: PLAYER.paused,
type: PLAYER.type type: PLAYER.type