diff nodescore.js @ 58:474c1ad1e811

big fix to seq logic and control css

--- a/nodescore.js	Thu Dec 20 12:35:18 2012 +0000
+++ b/nodescore.js	Sun Mar 31 01:46:39 2013 +0000
@@ -36,14 +36,12 @@
 	});    
     });
 
-httpServer.listen(8889);
+httpServer.listen(8890);
 
 var pinging=0
 console.log("ping set to 0")
 
 //requirejs(['socketsstuff'],function(socketsstuff) {});
-
-
 ////////////////////////////////////////////
 // connect to websockets 
 ////////////////////////////////////////////
@@ -205,11 +203,15 @@
 	 var ztime = time; 
 	 var totaltime = Math.floor(time/tempoms)
 	 var unit = seq.units[seq.counter];
+	var unitlast = seq.units[seq.counter-1];
+  
 	 var voice = seq.voice;
-	 console.log(time)
+	console.log(unit,unitlast)
 	 // initiate first page here
-	 socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter);
-	 socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter);
+	socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,unitlast);
+	socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,unitlast);
+	console.log("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter, seq.durations[seq.counter])
+
 	 
 	 function sequenCer() {
 	     //    console.log(ztime)
@@ -222,29 +224,29 @@
 		 var counter = Math.floor(ztime/tempoms)
 		 //console.log(counter)
 		 if (counter >= 0 ){
-		     socket.broadcast.emit('counterText', voice, seq.counter, counter);
-		     socket.emit('counterText', voice, seq.counter, counter);
+		     socket.broadcast.emit('counterText', voice, unit, counter,seq.counter,unitlast);
+		     socket.emit('counterText', voice, unit, counter,seq.counter,unitlast);
 		     
-		     if (counter <= outcount ) {              
-			 socket.broadcast.emit('countinFromServer', voice, counter, "","stop in: ", "red", "transparent");
+		     if (counter <= outcount ) {
+			 socket.broadcast.emit('countinFromServer', voice, counter, "","stop in: ", "red", "transparent",unit);
 		     }
 		     
 		     if (counter > (totaltime)-incount  && counter <= totaltime ) {
-			 socket.broadcast.emit('countinFromServer', voice, counter-(totaltime-incount), "","play in: ", "green","transparent");
-			 socket.emit('countinFromServer', voice, counter-(totaltime-incount), "","play in: ", "green","transparent");
+			 socket.broadcast.emit('countinFromServer', voice, counter-(totaltime-incount), "","play in: ", "green","transparent",unit);
+			 socket.emit('countinFromServer', voice, counter-(totaltime-incount), "","play in: ", "green","transparent",unit);
 		     }
 		     
 		     if (counter == (totaltime)-incount ) {
-			 socket.broadcast.emit('countinFromServer', voice, "+", "","playing.. ", "green","transparent");
-			socket.emit('countinFromServer', voice, "+", "","playing.. ", "green","transparent");
+			 socket.broadcast.emit('countinFromServer', voice, "+", "","playing.. ", "green","transparent",unit);
+			 socket.emit('countinFromServer', voice, "+", "","playing.. ", "green","transparent",unit);
 		     }
 		     
 		     // remove displayed number with " " at end of both countin/out
 		     
 		     if (counter == 0 ) {
-			 socket.broadcast.emit('countinFromServer', voice, "", "","", "green","transparent");
-			 socket.broadcast.emit('counterText', voice, seq.counter, "");
-			 socket.emit('counterText', voice, seq.counter, "");
+			 socket.broadcast.emit('countinFromServer', voice, "", "","", "green","transparent",unit);
+			 socket.broadcast.emit('counterText', voice, seq.counter, "", unit);
+			 socket.emit('counterText', voice, seq.counter, "",unit);
 		     }
 		 }		    
 				
@@ -261,6 +263,7 @@
 	     if (counter == 0){
 		 seq.counter = (seq.counter + 1) % seq.durations.length	    		
 		socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter);
+		 console.log("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter, seq.durations[seq.counter])
 		 //delete tockTock;	
 		 step(seq);     
 	     }
@@ -366,4 +369,4 @@
 //exports.io = io;
 //exports.sio = sio;
 exports.socket= io.sockets;
-exports.httpServer = httpServer;
\ No newline at end of file
+exports.httpServer = httpServer;