From 605f57448a11d9c39b77a67f87f7109c358a4e8a Mon Sep 17 00:00:00 2001
From: david <david.daily@daviddaily.dev>
Date: Tue, 12 May 2020 22:59:34 -0500
Subject: [PATCH] Update config file, clean up code quite a bit

---
 VB.ahk               |  93 +++++++++++++++++++++----------------------
 default.nktrl2_data  | Bin 0 -> 403 bytes
 settings.nktrl2_data | Bin 403 -> 0 bytes
 3 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 default.nktrl2_data
 delete mode 100644 settings.nktrl2_data

diff --git a/VB.ahk b/VB.ahk
index 86cee28..213d429 100644
--- a/VB.ahk
+++ b/VB.ahk
@@ -75,19 +75,19 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Strip[0]" . ".Gain", Lvl)
+					adjustVolLvl("Strip[0].Gain", Lvl)
 					Return
 				Case 1:
 					Lvl := dial_to_pan(val)
-					adjustVolLvl("Strip[0]" . ".Pan_x", Lvl)
+					adjustVolLvl("Strip[0].Pan_x", Lvl)
 				Case 2:
-					adjustToggle("Strip[0]" . ".Solo", val)
+					adjustToggle("Strip[0].Solo", val)
 					Return
 				Case 3:
-					adjustToggle("Strip[0]" . ".Mute", val)
+					adjustToggle("Strip[0].Mute", val)
 					Return
 				Case 4:
-					adjustToggle("Strip[0]" . ".B2", val)
+					adjustToggle("Strip[0].B2", val)
 					Return
 				Default:
 					Return
@@ -97,10 +97,10 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Bus[2]" . ".Gain", Lvl)
+					adjustVolLvl("Bus[2].Gain", Lvl)
 					Return
 				Case 3:
-					adjustToggle("Bus[2]" . ".Mute", val)
+					adjustToggle("Bus[2].Mute", val)
 					Return
 				Default:
 					Return
@@ -110,19 +110,19 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Strip[3]" . ".Gain", Lvl)
+					adjustVolLvl("Strip[3].Gain", Lvl)
 					Return
 				Case 1:
 					Lvl := dial_to_pan(val)
-					adjustVolLvl("Strip[3]" . ".Pan_x", Lvl)
+					adjustVolLvl("Strip[3].Pan_x", Lvl)
 				Case 2:
-					adjustToggle("Strip[3]" . ".Solo", val)
+					adjustToggle("Strip[3].Solo", val)
 					Return
 				Case 3:
-					adjustToggle("Strip[3]" . ".Mute", val)
+					adjustToggle("Strip[3].Mute", val)
 					Return
 				Case 4:
-					adjustToggle("Strip[3]" . ".B2", val)
+					adjustToggle("Strip[3].B2", val)
 					Return
 				Default:
 					Return
@@ -132,10 +132,10 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Bus[3]" . ".Gain", Lvl)
+					adjustVolLvl("Bus[3].Gain", Lvl)
 					Return
 				Case 3:
-					adjustToggle("Bus[3]" . ".Mute", val)
+					adjustToggle("Bus[3].Mute", val)
 					Return
 				Default:
 					Return
@@ -145,19 +145,19 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Strip[4]" . ".Gain", Lvl)
+					adjustVolLvl("Strip[4].Gain", Lvl)
 					Return
 				Case 1:
 					Lvl := dial_to_pan(val)
-					adjustVolLvl("Strip[4]" . ".Pan_x", Lvl)
+					adjustVolLvl("Strip[4].Pan_x", Lvl)
 				Case 2:
-					adjustToggle("Strip[4]" . ".Solo", val)
+					adjustToggle("Strip[4].Solo", val)
 					Return
 				Case 3:
-					adjustToggle("Strip[4]" . ".Mute", val)
+					adjustToggle("Strip[4].Mute", val)
 					Return
 				Case 4:
-					adjustToggle("Strip[4]" . ".B2", val)
+					adjustToggle("Strip[4].B2", val)
 					Return
 				Default:
 					Return
@@ -167,10 +167,10 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Bus[0]" . ".Gain", Lvl)
+					adjustVolLvl("Bus[0].Gain", Lvl)
 					Return
 				Case 3:
-					adjustToggle("Bus[0]" . ".Mute", val)
+					adjustToggle("Bus[0].Mute", val)
 					Return
 				Default:
 					Return
@@ -180,10 +180,10 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Bus[1]" . ".Gain", Lvl)
+					adjustVolLvl("Bus[1].Gain", Lvl)
 					Return
 				Case 3:
-					adjustToggle("Bus[1]" . ".Mute", val)
+					adjustToggle("Bus[1].Mute", val)
 					Return
 				Default:
 					Return
@@ -193,20 +193,20 @@ midiCCin:
 				{
 				Case 0:
 					Lvl := fader_to_fader(val)
-					adjustVolLvl("Strip[2]" . ".Gain", Lvl)
+					adjustVolLvl("Strip[2].Gain", Lvl)
 					Return
 				Case 1:
 					Lvl := dial_to_pan(val)
-					adjustVolLvl("Strip[2]" . ".Pan_x", Lvl)
+					adjustVolLvl("Strip[2].Pan_x", Lvl)
 				Case 2:
-					adjustToggle("Strip[2]" . ".Solo", val)
+					adjustToggle("Strip[2].Solo", val)
 					Return
 				Case 3:
-					adjustToggle("Strip[2]" . ".Mute", val)
+					adjustToggle("Strip[2].Mute", val)
 					Return
 				Case 4:
-					adjustToggle("Strip[2]" . ".B1", val)
-					adjustToggle("Strip[2]" . ".B2", val)
+					adjustToggle("Strip[2].B1", val)
+					adjustToggle("Strip[2].B2", val)
 					Return
 				Default:
 					Return
@@ -215,19 +215,19 @@ midiCCin:
 			Switch cc
 			{
 				Case 7:	; Rewind
-					adjustToggle("Recorder" . ".REW", val)
+					adjustToggle("Recorder.REW", val)
 					Return
 				Case 8:	; Fast Forward
-					adjustToggle("Recorder" . ".FF", val)
+					adjustToggle("Recorder.FF", val)
 					Return
 				Case 9:
-					adjustToggle("Recorder" . ".Stop", val)
+					adjustToggle("Recorder.Stop", val)
 					Return
 				Case 10:
-					adjustToggle("Recorder" . ".Play", val)
+					adjustToggle("Recorder.Play", val)
 					Return
 				Case 11:
-					adjustToggle("Recorder" . ".Record", val)
+					adjustToggle("Recorder.Record", val)
 					Return				
 				Default:
 					Return
@@ -254,14 +254,14 @@ dial_to_pan(val)
 ; =============
 
 Volume_Mute::
-	b0M := Round(readParam("Bus[0]" . ".Mute"))	; Speakers
-	b1M := Round(readParam("Bus[1]" . ".Mute"))	; Headphones
+	b0M := Round(readParam("Bus[0].Mute"))	; Speakers
+	b1M := Round(readParam("Bus[1].Mute"))	; Headphones
 	cM := b0M + b1M
 
 	if (cM = "2")
 	{	; Unmute the ones that were unmuted before
-		adjustToggle("Bus[0]" . ".Mute", b0Ms)	; Speakers
-		adjustToggle("Bus[1]" . ".Mute", b1Ms)	; Headphones
+		adjustToggle("Bus[0].Mute", b0Ms)	; Speakers
+		adjustToggle("Bus[1].Mute", b1Ms)	; Headphones
 	} else {
 			if !(b0M)	; Speakers
 			{
@@ -277,8 +277,8 @@ Volume_Mute::
 				b1Ms := False
 			}
 		; Mute
-			adjustToggle("Bus[0]" . ".Mute", "0")	; Speakers
-			adjustToggle("Bus[1]" . ".Mute", "0")	; Headphones
+			adjustToggle("Bus[0].Mute", "0")	; Speakers
+			adjustToggle("Bus[1].Mute", "0")	; Headphones
 	}
 Return
 
@@ -315,12 +315,12 @@ adjustVolLvl(loc, tVol) {
 	DllCall(VMR_FUNCTIONS["SetParameterFloat"], "AStr", loc, "Float", tVol, "Int")
 }
 
-adjustToggle(loc, tM) {
-	if (tM = 0)
-		tM := 1
-	else
-		tM := 0
-	DllCall(VMR_FUNCTIONS["SetParameterFloat"], "AStr", loc, "Float", tM, "Int")
+adjustToggle(func, togg) {
+	DllCall(VMR_FUNCTIONS["SetParameterFloat"], "AStr", func, "Float", togg, "Int")
+}
+
+adjustString(func, str) {
+	DllCall(VMR_FUNCTIONS["SetParameterFloat"], "AStr", func, "Float", str, "Str")
 }
 
 
@@ -341,4 +341,3 @@ die(die_string:="UNSPECIFIED FATAL ERROR.", exit_status:=254) {
 	MsgBox 16, FATAL ERROR, %die_string%
 	ExitApp exit_status
 }
-
diff --git a/default.nktrl2_data b/default.nktrl2_data
new file mode 100644
index 0000000000000000000000000000000000000000..511239e1f38bec8600ce1f9a8def9446897d9c3c
GIT binary patch
literal 403
zcmaKoyAgmO5Jc|;#ZO=hmOx-&0d_zM=C**H<Lw%m+%og#<{kt~KK5L$yKM5PFs)%I
zhGxm1KR0f0;qO=5;C?kKs2wH^WF%eP`LBboqpy2k557*mp3oSFjfIVcjiu*)AQL%~
O6FGyr7%O7m^UDj|-5tvS

literal 0
HcmV?d00001

diff --git a/settings.nktrl2_data b/settings.nktrl2_data
deleted file mode 100644
index 9859671be9e5f1f3d7745cb1d6c01e1358c577fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmaKnxe)>}6hkHMBcO#X!2tmU(1A-Jrv=lwk+cEq?2Lc##<srXQF+`;eZA|150UBJ
zhbnYUnf2$C7cVUJn_j%%M4H^_N^Zkl7};x0_{pGU-v@5z*tZIw-A)*|_y6wo--oe$
j9EYFPSQ|_Q!eK;uBfa6@38xUJP!^ppCa+@isKH{s)Nvia