comparison nodescore.js @ 10:0e5543ccb8fb

fixed transport control of metro and countdown visualisation on control page

 	var time = ((seq.durations[seq.counter]+1) *timemultiplier) + 30000 + (outcount*1000);
 	var ztime = time; var totaltime = time/1000
 	var unit = seq.units[seq.counter];
 	var tempoms = 60000/seq.mm
 	
-	tock = setInterval(function(){
+	var tock = setInterval(function(){
 	    
 	    if (ztime >= 0 ){
 		// basic unit is still the second/1000ms - change this to tempoms? no i dont think so
 		// count in and count out
 		////////////////////////////////////////////
 		
 		var counter = ztime/1000
 		
+		socket.emit('counterText', seq.voice, seq.counter, counter);
+
 		if (counter > 0 && counter <= outcount ) {              
 		    socket.broadcast.emit('countinFromServer', seq.voice, counter, "","", "white", "transparent");
 		}
 		// remove displayed number with " " at end of both countin/out
 		if (counter == 0 ) {

 		socket.emit('metroPulse', tempoms, seq.voice,seq.metrobeat);	
 	    }
 	    
 	    // flip the page
 	    if (ztime == 0){
+		socket.emit('counterText', seq.voice, seq.counter, " ");
 		seq.counter = (seq.counter + 1) % seq.durations.length	    		
 		socket.broadcast.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter);
 		socket.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter);		
 		step(seq);     
+
 	    }
 
 	    if (ztime < 0){}	    	    	    
 	    // decrement the time 
 	    ztime -= 1000
 			
 	}, tempoms)
+
+
+	socket.on('stopSeq', function (seq) { 
+	    console.log("stop")
+	    clearInterval(tock);	    
+	    sequencerState=0;  
+	    stopChr();
+	});
+
+
+
 			  };
     
     step = function (seq) {
 	clearInterval(countdowntick);
 	countdowntick(seq)

 	}
 	else console.log("already started...")
     });
 
     
-    socket.on('stopSeq', function () { 
-	clearInterval(tock);	    
-	sequencerState=0;  
-	stopChr();
-    });
+
 
     socket.on('resetSeq', function () { 
 	console.log("rrrrreset")
 	resetChr();