mirror of
https://github.com/onyx-and-iris/nvda-voicemeeter.git
synced 2026-04-19 07:43:30 +00:00
Compare commits
4 Commits
v.0.5.0.b1
...
496cc35321
| Author | SHA1 | Date | |
|---|---|---|---|
| 496cc35321 | |||
| d758db9dee | |||
| 876de55ad2 | |||
| eab4b1c6a9 |
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "nvda_voicemeeter"
|
||||
version = "0.5.0b1"
|
||||
version = "0.5.0"
|
||||
description = "A Voicemeeter app compatible with NVDA"
|
||||
authors = [
|
||||
{ name = "onyx-and-iris", email = "code@onyxandiris.online" },
|
||||
|
||||
@@ -33,7 +33,7 @@ def get_nvdapath():
|
||||
|
||||
try:
|
||||
NVDA_PATH = Path(get_nvdapath()) / "nvda.exe"
|
||||
except FileNotFoundError as e:
|
||||
except FileNotFoundError:
|
||||
NVDA_PATH = ""
|
||||
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ class CompSlider(psg.Slider):
|
||||
return {
|
||||
"range": (-24, 24),
|
||||
"default_value": self.vm.strip[self.index].comp.gainout,
|
||||
"resolution": 0.01,
|
||||
"resolution": 0.1,
|
||||
"disabled": True,
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ def _make_hardware_ins_cache(vm) -> dict:
|
||||
def _make_hardware_outs_cache(vm) -> dict:
|
||||
hw_outs = {**{f"HARDWARE OUT||A{i + 1}": vm.bus[i].device.name for i in range(vm.kind.phys_out)}}
|
||||
if vm.kind.name == "basic":
|
||||
hw_outs |= {f"HARDWARE OUT||A2": vm.bus[1].device.name}
|
||||
hw_outs |= {"HARDWARE OUT||A2": vm.bus[1].device.name}
|
||||
return hw_outs
|
||||
|
||||
|
||||
|
||||
@@ -48,8 +48,11 @@ def get_patch_composite_list(kind) -> list:
|
||||
for i in range(kind.phys_out):
|
||||
[temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right")]
|
||||
for i in range(kind.phys_out, kind.phys_out + kind.virt_out):
|
||||
[temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")]
|
||||
temp.append(f"BUS Channel")
|
||||
[
|
||||
temp.append(f"IN#{i + 1} {channel}")
|
||||
for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")
|
||||
]
|
||||
temp.append("BUS Channel")
|
||||
return temp
|
||||
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ class NVDAVMWindow(psg.Window):
|
||||
for i in range(self.kind.phys_out):
|
||||
self[f"HARDWARE OUT||A{i + 1}"].Widget.config(**buttonmenu_opts)
|
||||
if self.kind.name == "basic":
|
||||
self[f"HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts)
|
||||
self["HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts)
|
||||
if self.kind.name != "basic":
|
||||
[self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)]
|
||||
slider_opts = {"takefocus": 1, "highlightthickness": 1}
|
||||
@@ -190,9 +190,9 @@ class NVDAVMWindow(psg.Window):
|
||||
self[f"HARDWARE OUT||A{i + 1}"].bind("<space>", "||KEY SPACE", propagate=False)
|
||||
self[f"HARDWARE OUT||A{i + 1}"].bind("<Return>", "||KEY ENTER", propagate=False)
|
||||
if self.vm.kind.name == "basic":
|
||||
self[f"HARDWARE OUT||A2"].bind("<FocusIn>", "||FOCUS IN")
|
||||
self[f"HARDWARE OUT||A2"].bind("<space>", "||KEY SPACE", propagate=False)
|
||||
self[f"HARDWARE OUT||A2"].bind("<Return>", "||KEY ENTER", propagate=False)
|
||||
self["HARDWARE OUT||A2"].bind("<FocusIn>", "||FOCUS IN")
|
||||
self["HARDWARE OUT||A2"].bind("<space>", "||KEY SPACE", propagate=False)
|
||||
self["HARDWARE OUT||A2"].bind("<Return>", "||KEY ENTER", propagate=False)
|
||||
|
||||
# Patch ASIO
|
||||
if self.kind.name != "basic":
|
||||
@@ -423,7 +423,7 @@ class NVDAVMWindow(psg.Window):
|
||||
identifier, partial = focus.Key.split("||")
|
||||
_, index = identifier.split()
|
||||
index = int(index)
|
||||
data = self.popup.rename("Label", index, title=f"Rename", tab=tab)
|
||||
data = self.popup.rename("Label", index, title="Rename", tab=tab)
|
||||
if not data: # cancel was pressed
|
||||
continue
|
||||
match tab:
|
||||
@@ -452,16 +452,16 @@ class NVDAVMWindow(psg.Window):
|
||||
case "tab||Settings":
|
||||
self.write_event_value("ADVANCED SETTINGS", None)
|
||||
case "tab||Physical Strip":
|
||||
if self.kind.name != "potato":
|
||||
continue
|
||||
if values["tabgroup||Physical Strip"] == "tab||Physical Strip||sliders":
|
||||
if focus := self.find_element_with_focus():
|
||||
identifier, partial = focus.key.split("||")
|
||||
_, index = identifier.split()
|
||||
if "SLIDER COMP" in partial:
|
||||
self.popup.compressor(int(index), title="Advanced Compressor")
|
||||
elif "SLIDER GATE" in partial:
|
||||
self.popup.gate(int(index), title="Advanced Gate")
|
||||
match self.kind.name:
|
||||
case "potato":
|
||||
if "SLIDER COMP" in partial:
|
||||
self.popup.compressor(int(index), title="Advanced Compressor")
|
||||
elif "SLIDER GATE" in partial:
|
||||
self.popup.gate(int(index), title="Advanced Gate")
|
||||
|
||||
# Menus
|
||||
case [["Restart", "Audio", "Engine"], ["MENU"]]:
|
||||
@@ -964,6 +964,7 @@ class NVDAVMWindow(psg.Window):
|
||||
self.vm.strip[int(index)].gain = 0
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=0)
|
||||
case "COMP" | "GATE" | "DENOISER":
|
||||
target = getattr(self.vm.strip[int(index)], param.lower())
|
||||
setattr(target, "knob", 0)
|
||||
self[f"STRIP {index}||SLIDER {param}"].update(value=0)
|
||||
case "AUDIBILITY":
|
||||
|
||||
Reference in New Issue
Block a user