mirror of
https://github.com/onyx-and-iris/nvda-voicemeeter.git
synced 2025-05-22 11:40:25 +01:00
Compare commits
No commits in common. "9b757b743b4205986f2844a1739ce11d36aca445" and "0c806b8e4c10f066c44f97221959bbd7b1554c60" have entirely different histories.
9b757b743b
...
0c806b8e4c
@ -139,28 +139,6 @@ class NVDAVMWindow(psg.Window):
|
||||
self.bind("<Control-a>", "CTRL-A")
|
||||
for i in range(1, 10):
|
||||
self.bind(f"<Control-Key-{i}>", f"CTRL-{i}")
|
||||
for i in range(1, 10):
|
||||
self.bind(f"<Alt-Key-{i}>", f"ALT-{i}")
|
||||
self.bind("<Control-o>", "CTRL-O")
|
||||
self.bind("<Control-s>", "CTRL-S")
|
||||
self.bind("<Control-m>", "CTRL-M")
|
||||
self.bind("<Control-Alt-Right>", "CTRL-ALT-RIGHT")
|
||||
self.bind("<Control-Alt-Left>", "CTRL-ALT-LEFT")
|
||||
|
||||
if self.kind.name == "basic":
|
||||
self.bind("<Control-u>", "AUDIBILITY MODE")
|
||||
self.bind("<Control-g>", "GAIN MODE")
|
||||
elif self.kind.name == "banana":
|
||||
self.bind("<Control-g>", "GAIN MODE")
|
||||
self.bind("<Control-c>", "COMP MODE")
|
||||
self.bind("<Control-t>", "GATE MODE")
|
||||
self.bind("<Control-l>", "LIMIT MODE")
|
||||
else:
|
||||
self.bind("<Control-g>", "GAIN MODE")
|
||||
self.bind("<Control-c>", "COMP MODE")
|
||||
self.bind("<Control-t>", "GATE MODE")
|
||||
self.bind("<Control-d>", "DENOISER MODE")
|
||||
self.bind("<Control-l>", "LIMIT MODE")
|
||||
|
||||
# Hardware In
|
||||
for i in range(self.vm.kind.phys_in):
|
||||
@ -423,7 +401,6 @@ class NVDAVMWindow(psg.Window):
|
||||
|
||||
Main thread will shutdown once a close or exit event occurs
|
||||
"""
|
||||
mode = None
|
||||
|
||||
while True:
|
||||
event, values = self.read()
|
||||
@ -431,20 +408,6 @@ class NVDAVMWindow(psg.Window):
|
||||
self.logger.debug(f"values::{values}")
|
||||
if event in (psg.WIN_CLOSED, "Exit"):
|
||||
break
|
||||
if event in ("GAIN MODE", "COMP MODE", "GATE MODE", "DENOISER MODE", "LIMIT MODE"):
|
||||
mode = event
|
||||
if mode:
|
||||
self.nvda.speak(f"{mode} enabled")
|
||||
elif event == "Escape:27":
|
||||
if mode:
|
||||
self.nvda.speak(f"{mode.split()[0]} mode disabled")
|
||||
mode = None
|
||||
|
||||
if mode:
|
||||
if event == "Left:37":
|
||||
self.write_event_value("SLIDER-MODE-LEFT", mode.split()[0])
|
||||
elif event == "Right:39":
|
||||
self.write_event_value("SLIDER-MODE-RIGHT", mode.split()[0])
|
||||
|
||||
match parsed_cmd := self.parser.match.parseString(event):
|
||||
# Focus tabgroup
|
||||
@ -484,52 +447,6 @@ class NVDAVMWindow(psg.Window):
|
||||
or self.find_element_with_focus().Key != f"BUS {int(index) - 1}||MONO"
|
||||
):
|
||||
self[f"BUS {int(index) - 1}||SLIDER GAIN"].set_focus()
|
||||
case ["ALT-1" | "ALT-2" | "ALT-3" | "ALT-4" | "ALT-5" | "ALT-6" | "ALT-7" | "ALT-8" as bind]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip", "tab||Buses"):
|
||||
continue
|
||||
key, index = bind.split("-")
|
||||
if int(index) > self.kind.phys_out + self.kind.virt_out:
|
||||
continue
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, param = focus.Key.split("||")
|
||||
if int(index) <= self.kind.phys_out:
|
||||
self.write_event_value(f"{identifier}||A{int(index)}", None)
|
||||
else:
|
||||
self.write_event_value(f"{identifier}||B{int(index) - self.kind.phys_out}", None)
|
||||
case ["CTRL-O"]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip", "tab||Buses"):
|
||||
continue
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, param = focus.Key.split("||")
|
||||
self.write_event_value(f"{identifier}||MONO", None)
|
||||
case ["CTRL-S"]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip"):
|
||||
continue
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, param = focus.Key.split("||")
|
||||
self.write_event_value(f"{identifier}||SOLO", None)
|
||||
case ["CTRL-M"]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip", "tab||Buses"):
|
||||
continue
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, param = focus.Key.split("||")
|
||||
self.write_event_value(f"{identifier}||MUTE", None)
|
||||
case ["SLIDER-MODE-LEFT"]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip", "tab||Buses"):
|
||||
continue
|
||||
param = values[event]
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, partial = focus.Key.split("||")
|
||||
if "SLIDER" not in partial:
|
||||
self.write_event_value(f"{identifier}||SLIDER {param}||KEY LEFT", None)
|
||||
case ["SLIDER-MODE-RIGHT"]:
|
||||
if values["tabgroup"] not in ("tab||Physical Strip", "tab||Virtual Strip", "tab||Buses"):
|
||||
continue
|
||||
param = values[event]
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, partial = focus.Key.split("||")
|
||||
if "SLIDER" not in partial:
|
||||
self.write_event_value(f"{identifier}||SLIDER {param}||KEY RIGHT", None)
|
||||
|
||||
# Rename popups
|
||||
case ["F2:113"]:
|
||||
@ -683,7 +600,7 @@ class NVDAVMWindow(psg.Window):
|
||||
val = values[f"ASIO CHECKBOX||{in_num} {channel}"]
|
||||
self.vm.patch.asio[index].set(val)
|
||||
channel = ("left", "right")[int(channel)]
|
||||
self.nvda.speak(str(val))
|
||||
self.nvda.speak(f"Patch ASIO {in_num} {channel} set to {val}")
|
||||
case [["ASIO", "CHECKBOX"], [in_num, channel], ["FOCUS", "IN"]]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
val = values[f"ASIO CHECKBOX||{in_num} {channel}"]
|
||||
@ -717,7 +634,9 @@ class NVDAVMWindow(psg.Window):
|
||||
)
|
||||
val = values[f"INSERT CHECKBOX||{in_num} {channel}"]
|
||||
self.vm.patch.insert[index].on = val
|
||||
self.nvda.speak(f"{'on' if val else 'off'}")
|
||||
self.nvda.speak(
|
||||
f"PATCH INSERT {in_num} {util._patch_insert_channels[int(channel)]} set to {'on' if val else 'off'}"
|
||||
)
|
||||
case [["INSERT", "CHECKBOX"], [in_num, channel], ["FOCUS", "IN"]]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
index = util.get_insert_checkbox_index(
|
||||
@ -757,17 +676,19 @@ class NVDAVMWindow(psg.Window):
|
||||
next_val = 0
|
||||
setattr(self.vm.strip[int(index)], actual, next_val)
|
||||
self.cache["strip"][f"STRIP {index}||{param}"] = next_val
|
||||
self.nvda.speak(["off", "k m", "k 1", "k 2"][next_val])
|
||||
self.nvda.speak(
|
||||
f"{label} {phonetic.get(actual, actual)} {['off', 'k m', 'k 1', 'k 2'][next_val]}"
|
||||
)
|
||||
else:
|
||||
val = not self.cache["strip"][f"STRIP {index}||{param}"]
|
||||
setattr(self.vm.strip[int(index)], actual, val)
|
||||
self.cache["strip"][f"STRIP {index}||{param}"] = val
|
||||
self.nvda.speak("on" if val else "off")
|
||||
self.nvda.speak(f"{label} {phonetic.get(actual, actual)} {'on' if val else 'off'}")
|
||||
case _:
|
||||
val = not self.cache["strip"][f"STRIP {index}||{param}"]
|
||||
setattr(self.vm.strip[int(index)], param if param[0] in ("A", "B") else param.lower(), val)
|
||||
self.cache["strip"][f"STRIP {index}||{param}"] = val
|
||||
self.nvda.speak("on" if val else "off")
|
||||
self.nvda.speak(f"{label} {param} {'on' if val else 'off'}")
|
||||
case [["STRIP", index], [param], ["FOCUS", "IN"]]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
val = self.cache["strip"][f"STRIP {index}||{param}"]
|
||||
@ -808,6 +729,7 @@ class NVDAVMWindow(psg.Window):
|
||||
| "TREBLE" as param,
|
||||
],
|
||||
]:
|
||||
label = self.cache["labels"][f"STRIP {index}||LABEL"]
|
||||
val = values[event]
|
||||
match param:
|
||||
case "GAIN":
|
||||
@ -822,6 +744,7 @@ class NVDAVMWindow(psg.Window):
|
||||
self.vm.strip[int(index)].limit = val
|
||||
case "BASS" | "MID" | "TREBLE":
|
||||
setattr(self.vm.strip[int(index)], param.lower(), val)
|
||||
self.nvda.speak(f"{label} {param} slider {val}")
|
||||
case [
|
||||
["STRIP", index],
|
||||
[
|
||||
@ -840,9 +763,9 @@ class NVDAVMWindow(psg.Window):
|
||||
]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
self.vm.event.pdirty = False
|
||||
val = values[f"STRIP {index}||SLIDER {param}"]
|
||||
label = self.cache["labels"][f"STRIP {index}||LABEL"]
|
||||
self.nvda.speak(f"{label} {param} {int(val) if param == 'LIMIT' else val}")
|
||||
val = values[f"STRIP {index}||SLIDER {param}"]
|
||||
self.nvda.speak(f"{label} {param} slider {int(val) if param == 'LIMIT' else val}")
|
||||
case [
|
||||
["STRIP", index],
|
||||
[
|
||||
@ -889,26 +812,20 @@ class NVDAVMWindow(psg.Window):
|
||||
|
||||
match param:
|
||||
case "GAIN":
|
||||
val = util.check_bounds(val, (-60, 12))
|
||||
self.vm.strip[int(index)].gain = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-60, 12)))
|
||||
case "COMP" | "GATE" | "DENOISER":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
setattr(target, "knob", val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(target, "knob", util.check_bounds(val, (0, 10)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "AUDIBILITY":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
self.vm.strip[int(index)].audibility = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].audibility = util.check_bounds(val, (0, 10))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "BASS" | "MID" | "TREBLE":
|
||||
val = util.check_bounds(val, (-12, 12))
|
||||
setattr(self.vm.strip[int(index)], param.lower(), val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(self.vm.strip[int(index)], param.lower(), util.check_bounds(val, (-12, 12)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-12, 12)))
|
||||
case "LIMIT":
|
||||
val = util.check_bounds(val, (-40, 12))
|
||||
self.vm.strip[int(index)].limit = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.nvda.speak(str(val))
|
||||
self.vm.strip[int(index)].limit = util.check_bounds(val, (-40, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-40, 12)))
|
||||
case [
|
||||
["STRIP", index],
|
||||
[
|
||||
@ -952,26 +869,20 @@ class NVDAVMWindow(psg.Window):
|
||||
|
||||
match param:
|
||||
case "GAIN":
|
||||
val = util.check_bounds(val, (-60, 12))
|
||||
self.vm.strip[int(index)].gain = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-60, 12)))
|
||||
case "COMP" | "GATE" | "DENOISER":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
setattr(target, "knob", val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(target, "knob", util.check_bounds(val, (0, 10)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "AUDIBILITY":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
self.vm.strip[int(index)].audibility = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].audibility = util.check_bounds(val, (0, 10))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "BASS" | "MID" | "TREBLE":
|
||||
val = util.check_bounds(val, (-12, 12))
|
||||
setattr(self.vm.strip[int(index)], param.lower(), val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(self.vm.strip[int(index)], param.lower(), util.check_bounds(val, (-12, 12)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-12, 12)))
|
||||
case "LIMIT":
|
||||
val = util.check_bounds(val, (-40, 12))
|
||||
self.vm.strip[int(index)].limit = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.nvda.speak(f"{param} {val}")
|
||||
self.vm.strip[int(index)].limit = util.check_bounds(val, (-40, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-40, 12)))
|
||||
case [
|
||||
["STRIP", index],
|
||||
[
|
||||
@ -1015,26 +926,20 @@ class NVDAVMWindow(psg.Window):
|
||||
|
||||
match param:
|
||||
case "GAIN":
|
||||
val = util.check_bounds(val, (-60, 12))
|
||||
self.vm.strip[int(index)].gain = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-60, 12)))
|
||||
case "COMP" | "GATE" | "DENOISER":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
setattr(target, "knob", val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(target, "knob", util.check_bounds(val, (0, 10)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "AUDIBILITY":
|
||||
val = util.check_bounds(val, (0, 10))
|
||||
self.vm.strip[int(index)].audibility = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.vm.strip[int(index)].audibility = util.check_bounds(val, (0, 10))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (0, 10)))
|
||||
case "BASS" | "MID" | "TREBLE":
|
||||
val = util.check_bounds(val, (-12, 12))
|
||||
setattr(self.vm.strip[int(index)], param.lower(), val)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
setattr(self.vm.strip[int(index)], param.lower(), util.check_bounds(val, (-12, 12)))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-12, 12)))
|
||||
case "LIMIT":
|
||||
val = util.check_bounds(val, (-40, 12))
|
||||
self.vm.strip[int(index)].limit = val
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=val)
|
||||
self.nvda.speak(f"{param} {val}")
|
||||
self.vm.strip[int(index)].limit = util.check_bounds(val, (-40, 12))
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=util.check_bounds(val, (-40, 12)))
|
||||
case [["STRIP", index], ["SLIDER", param], ["KEY", "CTRL", "SHIFT", "R"]]:
|
||||
match param:
|
||||
case "GAIN":
|
||||
@ -1052,7 +957,6 @@ class NVDAVMWindow(psg.Window):
|
||||
case "LIMIT":
|
||||
self.vm.strip[int(index)].limit = 12
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=12)
|
||||
self.nvda.speak(f"{param} {12 if param == 'LABEL' else 0}")
|
||||
|
||||
# Bus Params
|
||||
case [["BUS", index], [param]]:
|
||||
@ -1066,7 +970,7 @@ class NVDAVMWindow(psg.Window):
|
||||
self.TKroot.after(
|
||||
200,
|
||||
self.nvda.speak,
|
||||
"on" if val else "off",
|
||||
f"{label} bus {param} {'on' if val else 'off'}",
|
||||
)
|
||||
case "MONO" | "MUTE":
|
||||
val = not val
|
||||
@ -1075,7 +979,7 @@ class NVDAVMWindow(psg.Window):
|
||||
self.TKroot.after(
|
||||
200,
|
||||
self.nvda.speak,
|
||||
"on" if val else "off",
|
||||
f"{label} bus {param} {'on' if val else 'off'}",
|
||||
)
|
||||
case "MODE":
|
||||
bus_modes = util.get_bus_modes(self.vm)
|
||||
@ -1100,7 +1004,7 @@ class NVDAVMWindow(psg.Window):
|
||||
self.TKroot.after(
|
||||
200,
|
||||
self.nvda.speak,
|
||||
phonetic.get(next_bus, next_bus),
|
||||
f"{label} bus mode {phonetic.get(next_bus, next_bus)}",
|
||||
)
|
||||
case [["BUS", index], [param], ["FOCUS", "IN"]]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
@ -1118,12 +1022,13 @@ class NVDAVMWindow(psg.Window):
|
||||
label = self.cache["labels"][f"BUS {index}||LABEL"]
|
||||
val = values[event]
|
||||
self.vm.bus[int(index)].gain = val
|
||||
self.nvda.speak(f"{label} gain slider {val}")
|
||||
case [["BUS", index], ["SLIDER", "GAIN"], ["FOCUS", "IN"]]:
|
||||
if self.find_element_with_focus() is not None:
|
||||
self.vm.event.pdirty = False
|
||||
label = self.cache["labels"][f"BUS {index}||LABEL"]
|
||||
val = values[f"BUS {index}||SLIDER GAIN"]
|
||||
self.nvda.speak(f"{label} gain {val}")
|
||||
self.nvda.speak(f"{label} gain slider {val}")
|
||||
case [["BUS", index], ["SLIDER", "GAIN"], ["FOCUS", "OUT"]]:
|
||||
self.vm.event.pdirty = True
|
||||
case [["BUS", index], ["SLIDER", "GAIN"], ["KEY", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction]]:
|
||||
@ -1146,10 +1051,8 @@ class NVDAVMWindow(psg.Window):
|
||||
val += 3
|
||||
case "LEFT" | "DOWN":
|
||||
val -= 3
|
||||
val = util.check_bounds(val, (-60, 12))
|
||||
self.vm.bus[int(index)].gain = val
|
||||
self.vm.bus[int(index)].gain = util.check_bounds(val, (-60, 12))
|
||||
self[f"BUS {index}||SLIDER GAIN"].update(value=val)
|
||||
self.nvda.speak(str(val))
|
||||
case [
|
||||
["BUS", index],
|
||||
["SLIDER", "GAIN"],
|
||||
@ -1163,11 +1066,9 @@ class NVDAVMWindow(psg.Window):
|
||||
val -= 0.1
|
||||
self.vm.bus[int(index)].gain = util.check_bounds(val, (-60, 12))
|
||||
self[f"BUS {index}||SLIDER GAIN"].update(value=val)
|
||||
self.nvda.speak(str(val))
|
||||
case [["BUS", index], ["SLIDER", "GAIN"], ["KEY", "CTRL", "SHIFT", "R"]]:
|
||||
self.vm.bus[int(index)].gain = 0
|
||||
self[f"BUS {index}||SLIDER GAIN"].update(value=0)
|
||||
self.nvda.speak(str(val))
|
||||
|
||||
# Unknown
|
||||
case _:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user