# HG changeset patch # User Rob Canning # Date 1406589710 -3600 # Node ID e9cbc93e1d1082e7c1c7b0ce345438532953a102 # Parent f0d3ee8dacd6b01dc63cb0bf301fb75078b0f32e make sure images are always loaded - client late join bug closed diff -r f0d3ee8dacd6 -r e9cbc93e1d10 nodescore.js --- 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) } diff -r f0d3ee8dacd6 -r e9cbc93e1d10 www/martin/js/nodescore-client.js --- a/www/martin/js/nodescore-client.js Mon Jul 28 17:45:41 2014 +0000 +++ b/www/martin/js/nodescore-client.js Tue Jul 29 00:21:50 2014 +0100 @@ -93,12 +93,34 @@ */ socket.on("pageIni", pageIni); +// some if logic to check if file is already displayed +// if not load it - client doesnt need to be present at start function pageIni (group,unit,time,mm,seqcounter,nextunit) { console.log(unit + " ---> " + nextunit) - $("#previewbox-"+group).html("") - $("#previewbox-solo").html("") - $("#previewbox-solo-next").html("") + + if (group==1){ + var n1 = $("#previewbox-1").html().indexOf("svg"); + if (n1 == -1){ $("#previewbox-1").html("")} + } + if (group==2){ + var n2 = $("#previewbox-2").html().indexOf("svg"); + if (n2 == -1){ $("#previewbox-2").html("")} + } + if (group==3){ + var n3 = $("#previewbox-3").html().indexOf("svg"); + if (n3 == -1){ $("#previewbox-3").html("")} + } + + if (group==4){ + var n4 = $("#previewbox-4").html().indexOf("svg"); + if (n4 == -1){ $("#previewbox-4").html("")} + } + + $("#previewbox-solo").html("") + $("#previewbox-solo-next").html("") + //} + } ////////////////////////////////////////////////