From e5198e23d5dfd3c7f4b9a98676925476b6994a64 Mon Sep 17 00:00:00 2001
From: David Daily <david.daily@daviddaily.dev>
Date: Fri, 3 Mar 2023 23:09:25 -0600
Subject: [PATCH] update to current

---
 VB.ahk | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/VB.ahk b/VB.ahk
index 04ab796..8d92ec8 100644
--- a/VB.ahk
+++ b/VB.ahk
@@ -61,10 +61,11 @@ Switch A_Args[1]
 {
 Case "restart":
 	adjustToggle("Command.Restart", "1")
-	Reload		; It doesn't like processing MIDI after we restart VM ¯\_(ツ)_/¯ 
+	Reload		; It doesn't like processing MIDI after we send commands to VM ¯\_(ツ)_/¯ 
 	Return
 Case "show":
 	adjustToggle("Command.Show", "1")
+	Reload		; It doesn't like processing MIDI after we send commands to VM ¯\_(ツ)_/¯ 
 	Return
 }
 
@@ -106,19 +107,20 @@ midiCCin:
 	WorkLapR	:= "Strip[0]."
 	MicR		:= "Strip[1]."
 	PhoneR		:= "Strip[2]."
-		;empty		:= "Strip[3]."
+	;empty		:= "Strip[3]."
 	Music		:= "Strip[4]."
 
 	Desktop		:= "Strip[5]."
 	CommsR		:= "Strip[6]."
-	TelegramR	:= "Strip[7]."
+	AlissaR		:= "Strip[7]."
 	
 	MicS		:= "Bus[0]."
 	Speakers	:= "Bus[1]."
-	WorkLapS	:= "Bus[2]."
+	;empty		:= "Bus[2]."
 	PhoneS		:= "Bus[3]."
-	TelegramS	:= "Bus[4]."
+	WorkLapS	:= "Bus[4]."
 	CommsS		:= "Bus[5]."
+	AlissaS		:= "Bus[6]."
 
 	Switch chan
 	{
@@ -128,20 +130,23 @@ midiCCin:
 				Case 0:
 					Lvl := fader_to_fader(val)
 					adjustVolLvl(WorkLapR "Gain", Lvl)
+					adjustVolLvl(AlissaR "Gain", Lvl)
 					Return
 				Case 1:
 					Lvl := fader_to_fader(val)
 					adjustVolLvl(WorkLapS "Gain", Lvl)	; WL Send, hardly ever needs adjusted
+					adjustVolLvl(AlissaS "Gain", Lvl)	; Audio sent to Alissa
 					Return
 				Case 2:
 					adjustToggle(WorkLapR "Solo", val)
+					adjustToggle(AlissaR "Solo", val)
 					Return
 				Case 3:
 					adjustToggle(WorkLapS "Mute", val)	; WL Send mute, if I need to mute it I can just use the fader
 					flag("WLsend", val)
 					Return
 				Case 4:
-					adjustToggle(WorkLapR "A4", val)
+					adjustToggle(WorkLapR "A4", val)	; Sends audio to phone VBAN stream
 					Return
 				Default:
 					Return
@@ -205,16 +210,16 @@ midiCCin:
 					adjustVolLvl(CommsR "Pan_x", Lvl)
 					; make Telegram go in the opposite direction
 					Lvl := dial_to_rev_pan(val)
-					adjustVolLvl(TelegramR "Pan_x", Lvl)
+					adjustVolLvl(AlissaR "Pan_x", Lvl)
 				Case 2:
 					adjustToggle(CommsR "Solo", val)
 					Return
 				Case 3:
 					adjustToggle(CommsR "Mute", val)
 					Return
-				Case 4:		; sends Comms recieve and Telegram to Phone
+				Case 4:		; sends Comms recieve and Alissa to Phone
 					adjustToggle(CommsR "A4", val)
-					adjustToggle(TelegramR "A4", val)
+					adjustToggle(AlissaR "A4", val)
 					Return
 				Default:
 					Return
@@ -230,8 +235,10 @@ midiCCin:
 					if (readParam(CommsS "Mute"))
 					{
 						adjustToggle(CommsS "Mute", False)
+						flag("Csend", False)
 					} else {
 						adjustToggle(CommsS "Mute", True)
+						flag("Csend", True)
 					}
 					Return
 				Case 3:
@@ -241,9 +248,7 @@ midiCCin:
 				Case 4:	; Send music to Discord & Work
 					adjustToggle(Music "B1", val)
 					adjustToggle(Music "B2", val)
-					adjustToggle(Music "A3", val)
-					adjustToggle(MicR "Mute", val)	; Mic
-					adjustToggle(PhoneR "Mute", val)	; Phone
+					adjustToggle(Music "A5", val)
 					if (val)
 					{
 						Send {F22}	; Toggle PTT/Voice Activity (Shows up as UNK133 in discord)
@@ -263,9 +268,16 @@ midiCCin:
 					Lvl := fader_to_fader(val)
 					adjustVolLvl(Speakers "Gain", Lvl)
 					Return
+				Case 1:
+					Lvl := fader_to_fader(val)
+					adjustVolLvl(AlissaR "Gain", Lvl)
 				Case 3:
 					adjustToggle(Speakers "Mute", val)
 					Return
+				Case 4:
+					adjustToggle(AlissaR "Mute", val)
+					adjustToggle(AlissaS "Mute", val)
+					Return
 				Default:
 					Return
 				}
@@ -437,7 +449,7 @@ Volume_Mute::
 	b1M := readParam(MicS "Mute")	; Headphones
 	b2M := readParam(WorkLapS "Mute")	; Work Laptop Send
 	b3M := readParam(PhoneS "Mute")	; Comms Send
-	b4M := readParam(TelegramS "Mute")	; Recording
+	b4M := readParam(AlissaS "Mute")	; Recording
 	cM := b0M + b1M + b2M + b3M + b4M
 	
 	if (cM = "5")
@@ -446,13 +458,13 @@ Volume_Mute::
 		adjustToggle(MicS "Mute", b1Ms)	; Headphones
 		adjustToggle(WorkLapS "Mute", b2Ms)	; Work Laptop Send
 		adjustToggle(PhoneS "Mute", b3Ms)	; Comms Send
-		adjustToggle(TelegramS "Mute", b4Ms)	; Recording
+		adjustToggle(AlissaS "Mute", b4Ms)	; Recording
 	} else {
 		adjustToggle(Speakers "Mute", True)	; Speakers
 		adjustToggle(MicS "Mute", True)	; Headphones
 		adjustToggle(WorkLapS "Mute", True)	; Work Laptop Send
 		adjustToggle(PhoneS "Mute", True)	; Comms Send
-		adjustToggle(TelegramS "Mute", True)	; Recording
+		adjustToggle(AlissaS "Mute", True)	; Recording
 		b0Ms := b0M
 		b1Ms := b1M
 		b2Ms := b2M