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

Fix channel sync bug - global variables are bad

This commit is contained in:
calzoneman 2013-03-18 14:58:37 -05:00
parent baf52a2a78
commit 1bc20fe947
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
channel.js
View File

@ -28,6 +28,12 @@ var Channel = function(name) {
this.qlocked = true; this.qlocked = true;
this.poll = false; this.poll = false;
// Autolead stuff
// Accumulator
this.i = 0;
// Time of last update
this.time = new Date().getTime();
this.loadMysql(); this.loadMysql();
}; };
@ -432,7 +438,7 @@ Channel.prototype.playNext = function() {
}); });
// Enable autolead for non-twitch // Enable autolead for non-twitch
if(this.leader == null && this.currentMedia.type != "tw" && this.currentMedia.type != "li") { if(this.leader == null && this.currentMedia.type != "tw" && this.currentMedia.type != "li") {
time = new Date().getTime(); this.time = new Date().getTime();
channelVideoUpdate(this, this.currentMedia.id); channelVideoUpdate(this, this.currentMedia.id);
} }
} }
@ -666,10 +672,6 @@ Channel.prototype.sendAll = function(message, data) {
} }
} }
// Accumulator
var i = 0;
// Time of last update
var time = new Date().getTime();
// Autolead yay // Autolead yay
function channelVideoUpdate(chan, id) { function channelVideoUpdate(chan, id) {
// Someone changed the video or there's a manual leader, so your // Someone changed the video or there's a manual leader, so your
@ -677,16 +679,16 @@ function channelVideoUpdate(chan, id) {
if(chan.currentMedia == null || id != chan.currentMedia.id || chan.leader != null) if(chan.currentMedia == null || id != chan.currentMedia.id || chan.leader != null)
return; return;
// Add dt since last update // Add dt since last update
chan.currentMedia.currentTime += (new Date().getTime() - time)/1000.0; chan.currentMedia.currentTime += (new Date().getTime() - chan.time)/1000.0;
time = new Date().getTime(); chan.time = new Date().getTime();
// Video over, move on to next // Video over, move on to next
if(chan.currentMedia.currentTime > chan.currentMedia.seconds) { if(chan.currentMedia.currentTime > chan.currentMedia.seconds) {
chan.playNext(); chan.playNext();
} }
// Every ~5 seconds send a sync packet to everyone // Every ~5 seconds send a sync packet to everyone
else if(i % 5 == 0) else if(chan.i % 5 == 0)
chan.sendAll('mediaUpdate', chan.currentMedia.packupdate()); chan.sendAll('mediaUpdate', chan.currentMedia.packupdate());
i++; chan.i++;
// Do it all over again in about a second // Do it all over again in about a second
setTimeout(function() { channelVideoUpdate(chan, id); }, 1000); setTimeout(function() { channelVideoUpdate(chan, id); }, 1000);
} }