onyx_online/nvda-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-voicemeeter.git synced 2024-11-22 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

app now loads properly for kind basic

Browse Source
This commit is contained in:
onyx-and-iris 2023-08-26 10:42:18 +01:00
parent 92b0772df8
commit 4ebab80a19
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvda_voicemeeter/builder.py
View File

@ -48,6 +48,10 @@ class Builder:
def add_physical_device_opts(layout): def add_physical_device_opts(layout):
devices = get_input_device_list(self.vm) devices = get_input_device_list(self.vm)
devices.append("- remove device selection -") devices.append("- remove device selection -")
if self.kind.name == "basic":
num_outs = self.kind.phys_out + self.kind.virt_out
else:
num_outs = self.kind.phys_out
layout.append( layout.append(
[ [
psg.ButtonMenu( psg.ButtonMenu(
@ -56,7 +60,7 @@ class Builder:
menu_def=["", devices], menu_def=["", devices],
key=f"HARDWARE OUT||A{i + 1}", key=f"HARDWARE OUT||A{i + 1}",
) )
for i in range(self.kind.phys_out) for i in range(num_outs)
] ]
) )
@ -178,7 +182,7 @@ class Builder:
if j < self.kind.phys_out if j < self.kind.phys_out
else f"STRIP {i}||B{j - self.kind.phys_out + 1}", else f"STRIP {i}||B{j - self.kind.phys_out + 1}",
) )
for j in range(self.kind.num_strip) for j in range(self.kind.phys_out + self.kind.virt_out)
] ]
) )
@ -187,7 +191,7 @@ class Builder:
return psg.Frame(self.vm.strip[i].label, outputs) return psg.Frame(self.vm.strip[i].label, outputs)
def make_tab1_rows(self) -> psg.Frame: def make_tab1_rows(self) -> psg.Frame:
layout = [[self.make_tab1_row(i)] for i in range(self.kind.phys_out)] layout = [[self.make_tab1_row(i)] for i in range(self.kind.phys_in)]
return psg.Frame(None, layout, border_width=0) return psg.Frame(None, layout, border_width=0)
def make_tab2_row(self, i) -> psg.Frame: def make_tab2_row(self, i) -> psg.Frame:
@ -201,7 +205,7 @@ class Builder:
if j < self.kind.phys_out if j < self.kind.phys_out
else f"STRIP {i}||B{j - self.kind.phys_out + 1}", else f"STRIP {i}||B{j - self.kind.phys_out + 1}",
) )
for j in range(self.kind.num_strip) for j in range(self.kind.phys_out + self.kind.virt_out)
] ]
) )
@ -210,5 +214,5 @@ class Builder:
return psg.Frame(self.vm.strip[i].label, outputs) return psg.Frame(self.vm.strip[i].label, outputs)
def make_tab2_rows(self) -> psg.Frame: def make_tab2_rows(self) -> psg.Frame:
layout = [[self.make_tab1_row(i)] for i in range(self.kind.phys_out, self.kind.phys_out + self.kind.virt_out)] layout = [[self.make_tab1_row(i)] for i in range(self.kind.phys_in, self.kind.phys_in + self.kind.virt_in)]
return psg.Frame(None, layout, border_width=0) return psg.Frame(None, layout, border_width=0)

8
src/nvda_voicemeeter/window.py
View File

@ -31,7 +31,8 @@ class NVDAVMWindow(psg.Window):
layout = self.builder.run() layout = self.builder.run()
super().__init__(title, layout, finalize=True) super().__init__(title, layout, finalize=True)
[self[f"HARDWARE OUT||A{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)] [self[f"HARDWARE OUT||A{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)]
[self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)] if self.kind.name != "basic":
[self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)]
self.register_events() self.register_events()
def __enter__(self): def __enter__(self):
@ -57,8 +58,9 @@ class NVDAVMWindow(psg.Window):
self[f"ASIO CHECKBOX||IN{i + 1} 1"].bind("<FocusIn>", "||FOCUS IN") self[f"ASIO CHECKBOX||IN{i + 1} 1"].bind("<FocusIn>", "||FOCUS IN")
# Patch Composite # Patch Composite
for i in range(self.vm.kind.phys_out): if self.kind.name != "basic":
self[f"PATCH COMPOSITE||PC{i + 1}"].bind("<FocusIn>", "||FOCUS IN") for i in range(self.vm.kind.phys_out):
self[f"PATCH COMPOSITE||PC{i + 1}"].bind("<FocusIn>", "||FOCUS IN")
# Patch Insert # Patch Insert
if self.kind.name != "basic": if self.kind.name != "basic":