Mercurial > hg > nodescore

changeset 87:e9cbc93e1d10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f0d3ee8dacd6
children 54edc4cf4d44
files nodescore.js www/martin/js/nodescore-client.js
diffstat 2 files changed, 33 insertions(+), 9 deletions(-) [+]
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)
 	}
--- 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("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")
-    $("#previewbox-solo").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")
-    $("#previewbox-solo-next").html("<img src='svg/"+(nextunit) + ".svg" + "' width='100%'>")
+    
+    if (group==1){
+    var n1 = $("#previewbox-1").html().indexOf("svg"); 
+    if (n1 == -1){ $("#previewbox-1").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")}
+    }
+    if (group==2){
+    var n2 = $("#previewbox-2").html().indexOf("svg"); 
+    if (n2 == -1){ $("#previewbox-2").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")}
+    }
 
+    if (group==3){
+    var n3 = $("#previewbox-3").html().indexOf("svg"); 
+    if (n3 == -1){ $("#previewbox-3").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")}
+    }
+
+    if (group==4){
+    var n4 = $("#previewbox-4").html().indexOf("svg"); 
+    if (n4 == -1){ $("#previewbox-4").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")}
+    }
+
+        $("#previewbox-solo").html("<img src='svg/"+(unit) + ".svg" + "' width='100%'>")
+	$("#previewbox-solo-next").html("<img src='svg/"+(nextunit) + ".svg" + "' width='100%'>")
+    //}
+    
 }
 
 ////////////////////////////////////////////////