reactive ui

jhoar · Nov 15, 2018 · 219b050 · 219b050
1 parent 196447c
commit 219b050
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/src/Galaxy.cpp b/src/Galaxy.cpp
@@ -174,25 +174,37 @@ void Galaxy::step() {
 	// Get inputs from Rack
 	bool move = moveTrigger.process(inputs[MOVE_INPUT].value);
 
+	if (inputs[MODE_INPUT].active) {
+		float fMode = inputs[MODE_INPUT].value;
+		currMode = CoreUtil().getModeFromVolts(fMode);
+	} else {
+		currMode = params[MODE_PARAM].value;
+	}
+
+	if (inputs[KEY_INPUT].active) {
+		float fRoot = inputs[KEY_INPUT].value;
+		currRoot = CoreUtil().getKeyFromVolts(fRoot);
+	} else {
+		currRoot = params[KEY_PARAM].value;
+	}
+
+	if (mode == 1) {
+		rootName = CoreUtil().noteNames[currRoot];
+		modeName = "";
+	} else if (mode == 2) {
+		rootName = CoreUtil().noteNames[currRoot];
+		modeName = CoreUtil().modeNames[currMode];
+	} else {
+		rootName = "";
+		modeName = "";
+		chordExtName = "";
+	}
+
 	if (move) {
 
 		bool changed = false;
 		bool haveMode = false;
 
-		if (inputs[MODE_INPUT].active) {
-			float fMode = inputs[MODE_INPUT].value;
-			currMode = CoreUtil().getModeFromVolts(fMode);
-		} else {
-			currMode = params[MODE_PARAM].value;
-		}
-
-		if (inputs[KEY_INPUT].active) {
-			float fRoot = inputs[KEY_INPUT].value;
-			currRoot = CoreUtil().getKeyFromVolts(fRoot);
-		} else {
-			currRoot = params[KEY_PARAM].value;
-		}
-
 		// std::cout << "Str position: Root: " << currRoot << 
 		// 	" Mode: " << currMode << 
 		// 	" degree: " << degree << 
@@ -322,17 +334,11 @@ void Galaxy::step() {
 				CoreUtil().inversionNames[inversion];
 
 			if (mode == 2) {
-				rootName = CoreUtil().noteNames[currRoot];
-				modeName = CoreUtil().modeNames[currMode];
 				if (haveMode) {
 					chordExtName = degNames[degree * 6 + quality];
 				} else {
 					chordExtName = "";
 				} 
-			} else {
-				rootName = "";
-				modeName = "";
-				chordExtName = "";
 			}
 
 			lights[NOTE_LIGHT + light].value = 0.0f;