Mercurial > hg > nodescore
diff nodescore.js @ 87:e9cbc93e1d10
make sure images are always loaded - client late join bug closed
author | Rob Canning <rob@foo.net> |
---|---|
date | Tue, 29 Jul 2014 00:21:50 +0100 |
parents | 74367de56cbf |
children | f214909fb108 |
line wrap: on
line diff
--- a/nodescore.js Mon Jul 28 17:45:41 2014 +0000 +++ b/nodescore.js Tue Jul 29 00:21:50 2014 +0100 @@ -199,11 +199,12 @@ var ztime=time; var totaltime=time + initPage=function(seq){ // initiate first page here var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit ); - socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit ); + //socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit ); } function sequenCer() { @@ -216,7 +217,7 @@ //increment the transect if ( seq.counter==0 ){ seq.transect += 1 } var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; - socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit); + //socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit); clearInterval(pulse) step(seq); } @@ -254,18 +255,19 @@ voice, "+", "","playing.. ", "green","transparent",unit); } - } - + } // on each beat do: // push out the pulse to metronome seq.metrobeat = (seq.metrobeat+1)%seq.beatsinbar ; socket.broadcast.emit('metroPulse', tempoms, voice,seq.metrobeat); socket.emit('metroPulse', tempoms, voice, seq.metrobeat); + console.log("sdfasfdasdfasdfasf"); + //socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit); + var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; + socket.broadcast.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit ); } - // decrement the time ztime -= 1 - // this shows undefined counter output - bug related // console.log(counter) }