Compare commits

..

No commits in common. "496cc35321f61eafa8146b862e370b35a9898449" and "876de55ad2add15c886d209cc3c04fa40091b12b" have entirely different histories.

5 changed files with 10 additions and 13 deletions

View File

@ -33,7 +33,7 @@ def get_nvdapath():
try: try:
NVDA_PATH = Path(get_nvdapath()) / "nvda.exe" NVDA_PATH = Path(get_nvdapath()) / "nvda.exe"
except FileNotFoundError: except FileNotFoundError as e:
NVDA_PATH = "" NVDA_PATH = ""

View File

@ -97,7 +97,7 @@ class CompSlider(psg.Slider):
return { return {
"range": (-24, 24), "range": (-24, 24),
"default_value": self.vm.strip[self.index].comp.gainout, "default_value": self.vm.strip[self.index].comp.gainout,
"resolution": 0.1, "resolution": 0.01,
"disabled": True, "disabled": True,
} }

View File

@ -5,7 +5,7 @@ def _make_hardware_ins_cache(vm) -> dict:
def _make_hardware_outs_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)}} 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": if vm.kind.name == "basic":
hw_outs |= {"HARDWARE OUT||A2": vm.bus[1].device.name} hw_outs |= {f"HARDWARE OUT||A2": vm.bus[1].device.name}
return hw_outs return hw_outs

View File

@ -48,11 +48,8 @@ def get_patch_composite_list(kind) -> list:
for i in range(kind.phys_out): for i in range(kind.phys_out):
[temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right")] [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): 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"IN#{i + 1} {channel}") temp.append(f"BUS Channel")
for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")
]
temp.append("BUS Channel")
return temp return temp

View File

@ -45,7 +45,7 @@ class NVDAVMWindow(psg.Window):
for i in range(self.kind.phys_out): for i in range(self.kind.phys_out):
self[f"HARDWARE OUT||A{i + 1}"].Widget.config(**buttonmenu_opts) self[f"HARDWARE OUT||A{i + 1}"].Widget.config(**buttonmenu_opts)
if self.kind.name == "basic": if self.kind.name == "basic":
self["HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts) self[f"HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts)
if self.kind.name != "basic": if self.kind.name != "basic":
[self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)] [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} 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("<space>", "||KEY SPACE", propagate=False)
self[f"HARDWARE OUT||A{i + 1}"].bind("<Return>", "||KEY ENTER", propagate=False) self[f"HARDWARE OUT||A{i + 1}"].bind("<Return>", "||KEY ENTER", propagate=False)
if self.vm.kind.name == "basic": if self.vm.kind.name == "basic":
self["HARDWARE OUT||A2"].bind("<FocusIn>", "||FOCUS IN") self[f"HARDWARE OUT||A2"].bind("<FocusIn>", "||FOCUS IN")
self["HARDWARE OUT||A2"].bind("<space>", "||KEY SPACE", propagate=False) self[f"HARDWARE OUT||A2"].bind("<space>", "||KEY SPACE", propagate=False)
self["HARDWARE OUT||A2"].bind("<Return>", "||KEY ENTER", propagate=False) self[f"HARDWARE OUT||A2"].bind("<Return>", "||KEY ENTER", propagate=False)
# Patch ASIO # Patch ASIO
if self.kind.name != "basic": if self.kind.name != "basic":
@ -423,7 +423,7 @@ class NVDAVMWindow(psg.Window):
identifier, partial = focus.Key.split("||") identifier, partial = focus.Key.split("||")
_, index = identifier.split() _, index = identifier.split()
index = int(index) index = int(index)
data = self.popup.rename("Label", index, title="Rename", tab=tab) data = self.popup.rename("Label", index, title=f"Rename", tab=tab)
if not data: # cancel was pressed if not data: # cancel was pressed
continue continue
match tab: match tab: