diff --git a/VB.ahk b/VB.ahk index d37ee50..d8877a4 100644 --- a/VB.ahk +++ b/VB.ahk @@ -1,3 +1,4 @@ +#Include, flag.ahk SetWorkingDir, C:\Users\Leand.000\Documents\D3K #SingleInstance force #MaxHotkeysPerInterval 99000000 @@ -98,10 +99,7 @@ midiCCin: Lvl := fader_to_fader(val) adjustVolLvl("Bus[2].Gain", Lvl) Return - Case 2, 4: - adjustToggle("Bus[2].Mute", val) - Return - Case 3: + Case 2, 3, 4: adjustToggle("Bus[2].Mute", val) Return Default: @@ -201,10 +199,11 @@ midiCCin: adjustVolLvl("Bus[1].Gain", Lvl) Return Case 3: + adjustToggle("Strip[1].Mute", val) adjustToggle("Bus[1].Mute", val) Return - Case 4: ; Mute mic input - adjustToggle("Strip[1].Mute", val) + Case 4: + adjustToggle("Strip[1].B2", val) Return Default: Return @@ -230,8 +229,8 @@ midiCCin: adjustToggle("Strip[2].B2", val) if (val) { - Send {F22} ; Toggle PTT/Voice Activity - Send {F23 down} + Send {F22} ; Toggle PTT/Voice Activity (Shows up as UNK133 in discord) + Send {F23 down} ; PTT button (Shows up as UNK134 in discord) } else { Send {F23 up} Send {F22} ; Toggle PTT/Voice Activity @@ -263,8 +262,6 @@ midiCCin: { Send {F22} ; Toggle PTT/Voice Activity Send {F23 down} - ;Random, temp, 1, 4 - ;adjustString("Recorder.Load", "D:\Combine\metropolice\die" . temp . ".wav") adjustToggle("Recorder.Play", True) ; Temp fix until file loading works } else { Send {F23 up} @@ -277,13 +274,13 @@ midiCCin: Case 5: ; <- under Marker / dislike song if !(val) { - Send ^+{PgDn} + Send {F20} } Return Case 6: ; -> under Marker / like song if !(val) { - Send ^+{PgUp} + Send {F21} } Return Case 7: ; Rewind @@ -352,6 +349,7 @@ Volume_Mute:: adjustToggle("Bus[2].Mute", b2Ms) ; Work Laptop Send adjustToggle("Bus[3].Mute", b3Ms) ; Comms Send adjustToggle("Bus[4].Mute", b4Ms) ; Recording + Run %A_AhkPath% "flag.ahk" "off" } else { adjustToggle("Bus[0].Mute", True) ; Speakers adjustToggle("Bus[1].Mute", True) ; Headphones @@ -363,6 +361,7 @@ Volume_Mute:: b2Ms := b2M b3Ms := b3M b4Ms := b4M + Run %A_AhkPath% "flag.ahk" "s" "red" } Return