From c320a0a95f5c70eb135f9e94e59a2dbf78009c55 Mon Sep 17 00:00:00 2001
From: Nova deViator <nova@deviator.si>
Date: Wed, 9 Sep 2015 17:53:40 +0200
Subject: [PATCH] fixing siliconSynth & timeline

---
 scd/snd_lines.scd | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/scd/snd_lines.scd b/scd/snd_lines.scd
index 5b923d4..427b0a4 100644
--- a/scd/snd_lines.scd
+++ b/scd/snd_lines.scd
@@ -36,7 +36,6 @@ postln("~~~ function ~procLinesFunc ...");
 
 	siLinesData = List.newClear(0);
 
-
 	processItem = { |item, i, reverse=false, layer=0, tscale=1, toffset=0|
 
 		if((item[1].asInt > threshold) && (item[0].asInt < 6741) && (item[0].asInt > 3950), {
@@ -274,24 +273,28 @@ post(" ");
 		
 	} {
 		// exposition
-		frequency = siLines[step][0].asFloat.linexp(3900, 7200, 16000, 40);
-		frequency_alt = siLines[step][0].asFloat.linexp(3900, 7200, 40, 16000);
-		nextfrequency = siLines[step+1][0].asFloat.linexp(3900, 7200, 16000, 40);
-		nextfrequency_alt = siLines[step+1][0].asFloat.linexp(3900, 7200, 40, 16000);
-		nextplayhead = siLines[step+1][0].asFloat.linlin(3905.52, 7193.9, 0, (60*37+5));
-		playhead = siLines[step][0].asFloat.linlin(3905.52, 7193.9, 0, (60*37+5));
+		//frequency = siLines[step][0].asFloat.linexp(3900, 7200, 16000, 40);
+		frequency = siLines[step][4].asFloat;
+		// frequency_alt = siLines[step][0].asFloat.linexp(3900, 7200, 40, 16000); 
+		frequency_alt = siLines[step][5].asFloat;
+		playhead = siLines[step][0].asFloat;
+		nextfrequency = siLines[step+1][4].asFloat;
+		nextfrequency_alt = siLines[step+1][5].asFloat;
+		nextplayhead = siLines[step+1][0].asFloat;
 		delta = nextplayhead - playhead;
-		amp = siLines[step][1].asInt * 0.001;
-		nextamp = siLines[step+1][1].asInt * 0.001;
-		nextdelta = siLines[step+2][0].asFloat.linlin(3905.52, 7193.9, 0, (60*37+5)) - nextplayhead;
+		amp = siLines[step][3].asInt * 0.001;
+		nextamp = siLines[step+1][3].asInt * 0.001;
+		nextdelta = siLines[step+2][0].asFloat - nextplayhead;
 
 		//action::documentation
-		post("\n~" + step + "| ");
+		post("\n~" + step + "|");
+		post(siLines[step][1]);
+		post(" | ");
 		post((playhead/60).round(1));
 		post(":");
 		post((playhead%60).round(1));
 		post(" | ");
-		post(siLines[step][0]);
+		post(siLines[step][2]);
 		post( "nm | " );
 		post(frequency.round(1));
 		post("Hz | ");
@@ -302,7 +305,8 @@ post(" ");
 		post(delta.round(1));
 		postln("s");
 
-		post("                  ");
+		post("           |" + siLines[step+1][1]);
+		post("|   ");
 		post(delta.round(1));
 		post("s / ");
 		post(nextfrequency.round(1));