moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix channel.js bug, add defer to APIs for faster page loads

This commit is contained in:
calzoneman 2013-08-18 18:01:57 -05:00
parent b3526b5ee2
commit bab2b887f4
2 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
channel.js
View File

@ -1117,32 +1117,6 @@ Channel.prototype.onVideoChange = function () {
this.broadcastDrinks(); this.broadcastDrinks();
} }
// The server autolead function
function mediaUpdate(chan, id) {
// Bail cases - video changed, someone's leader, no video playing
if(chan.media == null ||
id != chan.media.id ||
chan.leader != null ||
chan.users.length == 0) {
return;
}
chan.media.currentTime += (new Date().getTime() - chan.time) / 1000.0;
chan.time = new Date().getTime();
// Show's over, move on to the next thing
if(chan.media.currentTime > chan.media.seconds + 1) {
chan.playNext();
}
// Send updates about every 5 seconds
else if(chan.i % 5 == 0) {
chan.sendAll("mediaUpdate", chan.media.timeupdate());
}
chan.i++;
setTimeout(function() { mediaUpdate(chan, id); }, 1000);
}
function isLive(type) { function isLive(type) {
return type == "li" // Livestream.com return type == "li" // Livestream.com
|| type == "tw" // Twitch.tv || type == "tw" // Twitch.tv
@ -1253,12 +1227,12 @@ Channel.prototype.addMedia = function(data, user) {
return; return;
} }
else { else {
chan.logger.log("### " + user.name + " queued " + item.media.title); self.logger.log("### " + user.name + " queued " + item.media.title);
chan.sendAll("queue", { self.sendAll("queue", {
item: item.pack(), item: item.pack(),
after: item.prev ? item.prev.uid : "prepend" after: item.prev ? item.prev.uid : "prepend"
}); });
chan.broadcastPlaylistMeta(); self.broadcastPlaylistMeta();
} }
}); });
return; return;
@ -1278,14 +1252,14 @@ Channel.prototype.addMedia = function(data, user) {
return; return;
} }
else { else {
chan.logger.log("### " + user.name + " queued " + item.media.title); self.logger.log("### " + user.name + " queued " + item.media.title);
chan.sendAll("queue", { self.sendAll("queue", {
item: item.pack(), item: item.pack(),
after: item.prev ? item.prev.uid : "prepend" after: item.prev ? item.prev.uid : "prepend"
}); });
chan.broadcastPlaylistMeta(); self.broadcastPlaylistMeta();
if(!item.temp) if(!item.temp)
chan.cacheMedia(item.media); self.cacheMedia(item.media);
} }
}); });
} }

12
www/channel.html
View File

@ -246,12 +246,12 @@
<script src="./assets/js/ui.js"></script> <script src="./assets/js/ui.js"></script>
<script src="./assets/js/callbacks.js"></script> <script src="./assets/js/callbacks.js"></script>
<!-- APIs --> <!-- APIs -->
<script src="http://www.youtube.com/iframe_api"></script> <script defer src="http://www.youtube.com/iframe_api"></script>
<script src="http://api.dmcdn.net/all.js"></script> <script defer src="http://api.dmcdn.net/all.js"></script>
<script src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script> <script defer src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script>
<script src="./assets/js/sc.js"></script> <script defer src="./assets/js/sc.js"></script>
<script src="./assets/js/froogaloop.min.js"></script> <script defer src="./assets/js/froogaloop.min.js"></script>
<script src="./assets/js/swf.js"></script> <script defer src="./assets/js/swf.js"></script>
<!-- Third party --> <!-- Third party -->
<script src="./assets/js/bootstrap.js"></script> <script src="./assets/js/bootstrap.js"></script>
<script src="./assets/js/bootstrap-transition.js"></script> <script src="./assets/js/bootstrap-transition.js"></script>