diff nodescore.js @ 63:9bf133b91890

big fix and move to order 8

--- a/nodescore.js	Fri Apr 26 17:06:49 2013 +0000
+++ b/nodescore.js	Tue May 21 00:35:33 2013 +0000
@@ -27,7 +27,7 @@
 
 // run webserver serving static html
 ////////////////////////////////////////////
-var clientFiles = new static.Server('/usr/share/nodescore/www');
+var clientFiles = new static.Server('www');
 var httpServer = http.createServer(
     function(request, response) {
 	request.addListener('end', function () {
@@ -190,20 +190,22 @@
     // all the variables this sequencer needs are in scoreB.js
     requirejs(['scoreB'],function(scoreB) {});
     var sequencerState = 0;
+    var transect = 0
     var countdowntick = function(seq){
-	// var tempoms = Math.floor(60000/seq.mm)
 	var tempoms = Math.floor(60000/seq.mm)	
 	var timemultiplier=1000
-	var outcount = 8; var incount=8;
-	var time = (( seq.durations[seq.counter]+1 ) 
+	var outcount = 2; var incount=3;
+	var time = (( seq.durations[seq.counter] ) 
 		    * timemultiplier ) 
-	    + 30000 + (outcount*tempoms);
+	    + 1000 + (outcount*tempoms);
 	var time = Math.floor(time)
 	var ztime = time; 
 	var totaltime = Math.floor(time/tempoms)
-	var unit = seq.units[seq.counter];
-	var unitlast = seq.units[seq.counter-1];
+
+	var unit = seq.units[transect%3][seq.counter];
+	var unitlast = seq.units[transect%3][seq.counter-1];
 	var voice = seq.voice;
+
 	 // initiate first page here
 	socket.broadcast.emit("pageFlipfromserver", 
 			      voice, unit, time, 
@@ -213,6 +215,7 @@
 		    seq.mm,seq.counter,unitlast);
 	 
 	function sequenCer() {
+	    
 	    if (ztime >= 0 ){
 		// basic unit is still the second/1000ms - change this to tempoms? no i dont think so
 		// count in and count out
@@ -254,9 +257,7 @@
 
 		}		    
 	
-		// on each beat do:
-		
-		
+		// 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); 
@@ -265,15 +266,23 @@
 	    
 	    // flip the page 
 	    if (counter == 0){
+	
 		seq.counter = (seq.counter + 1) % seq.durations.length	    		
 		socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter);
-		
+
+		if ( seq.counter==0 ){ transect += 1 }
+		console.log(voice, seq.counter,transect)
+
 		//delete tockTock;	
 		step(seq);     
+
 	    }
 	    
 	    // decrement the time 
 	    ztime -= tempoms
+
+
+
 	}
 	
 	var pulse = setInterval(sequenCer, tempoms);