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

implements events for patch composite

Browse Source
This commit is contained in:
onyx-and-iris 2023-08-25 20:23:21 +01:00
parent c308a8fd07
commit 7d3647afd7
4 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -168,4 +168,7 @@ controllerClient/*
# build files # build files
basic.py basic.py
banana.py banana.py
potato.py potato.py
# quick test
quick.py

11
src/nvda_voicemeeter/builder.py
View File

@ -64,7 +64,7 @@ class Builder:
psg.ButtonMenu( psg.ButtonMenu(
f"A{i}", f"A{i}",
size=(6, 3), size=(6, 3),
menu_def=["", [f"{device}" for device in devices]], menu_def=["", devices],
key=f"HARDWARE OUT||A{i}", key=f"HARDWARE OUT||A{i}",
) )
for i in range(1, self.kind.phys_out + 1) for i in range(1, self.kind.phys_out + 1)
@ -117,16 +117,15 @@ class Builder:
def add_physical_device_opts(layout): def add_physical_device_opts(layout):
outputs = get_patch_composite_list(self.vm.kind) outputs = get_patch_composite_list(self.vm.kind)
outputs.append("BUS Channel")
layout.append( layout.append(
[ [
psg.ButtonMenu( psg.ButtonMenu(
f"PC{i}", f"PC{i + 1}",
size=(6, 2), size=(6, 2),
menu_def=["", [f"{output}" for output in outputs]], menu_def=["", outputs],
key=f"PATCH COMPOSITE||PC{i}", key=f"PATCH COMPOSITE||PC{i + 1}",
) )
for i in range(1, self.kind.phys_out + 1) for i in range(self.kind.phys_out)
] ]
) )

12
src/nvda_voicemeeter/util.py
View File

@ -1,6 +1,3 @@
import PySimpleGUI as psg
def get_asio_checkbox_index(channel, num): def get_asio_checkbox_index(channel, num):
if channel == 0: if channel == 0:
return 2 * num - 2 return 2 * num - 2
@ -22,8 +19,9 @@ def get_input_device_list(vm):
def get_patch_composite_list(kind): def get_patch_composite_list(kind):
temp = [] temp = []
for i in range(1, kind.phys_out + 1): for i in range(kind.phys_out):
[temp.append(f"IN#{i} {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 + 1, kind.phys_out + kind.virt_out + 1): for i in range(kind.phys_out, kind.phys_out + kind.virt_out):
[temp.append(f"IN#{i} {channel}") for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")] [temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")]
temp.append(f"BUS Channel")
return temp return temp

45
src/nvda_voicemeeter/window.py
View File

@ -6,15 +6,19 @@ from .builder import Builder
from .models import _make_cache, _patch_insert_channels from .models import _make_cache, _patch_insert_channels
from .nvda import Nvda from .nvda import Nvda
from .parser import Parser from .parser import Parser
from .util import get_asio_checkbox_index, get_insert_checkbox_index from .util import (
get_asio_checkbox_index,
get_insert_checkbox_index,
get_patch_composite_list,
)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
psg.theme("Dark Blue 3") psg.theme("Dark Blue 3")
class Window(psg.Window): class NVDAVMWindow(psg.Window):
"""Represents the main window of the application""" """Represents the main window of the Voicemeeter NVDA application"""
def __init__(self, title, vm): def __init__(self, title, vm):
self.vm = vm self.vm = vm
@ -37,21 +41,23 @@ class Window(psg.Window):
self.close() self.close()
def register_events(self): def register_events(self):
# Hardware Out events """Registers events for widgets"""
# Hardware Out
for i in range(1, self.vm.kind.phys_out + 1): for i in range(1, self.vm.kind.phys_out + 1):
self[f"HARDWARE OUT||A{i}"].bind("<FocusIn>", "||FOCUS IN") self[f"HARDWARE OUT||A{i}"].bind("<FocusIn>", "||FOCUS IN")
# Patch ASIO events # Patch ASIO
if self.kind.name != "basic": if self.kind.name != "basic":
for i in range(1, self.kind.phys_out + 1): for i in range(1, self.kind.phys_out + 1):
self[f"ASIO CHECKBOX||IN{i} 0"].bind("<FocusIn>", "||FOCUS IN") self[f"ASIO CHECKBOX||IN{i} 0"].bind("<FocusIn>", "||FOCUS IN")
self[f"ASIO CHECKBOX||IN{i} 1"].bind("<FocusIn>", "||FOCUS IN") self[f"ASIO CHECKBOX||IN{i} 1"].bind("<FocusIn>", "||FOCUS IN")
# Patch Composite events # Patch Composite
for i in range(1, self.vm.kind.phys_out + 1): for i in range(1, self.vm.kind.phys_out + 1):
self[f"PATCH COMPOSITE||PC{i}"].bind("<FocusIn>", "||FOCUS IN") self[f"PATCH COMPOSITE||PC{i}"].bind("<FocusIn>", "||FOCUS IN")
# Patch Insert events # Patch Insert
if self.kind.name != "basic": if self.kind.name != "basic":
for i in range(1, self.kind.num_strip + 1): for i in range(1, self.kind.num_strip + 1):
if i <= self.kind.phys_in: if i <= self.kind.phys_in:
@ -66,11 +72,13 @@ class Window(psg.Window):
Main thread will shutdown once a close or exit event occurs Main thread will shutdown once a close or exit event occurs
""" """
while True: while True:
event, values = self.read() event, values = self.read()
if event in (psg.WIN_CLOSED, "Exit"): if event in (psg.WIN_CLOSED, "Exit"):
break break
match parsed_cmd := self.parser.match.parseString(event): match parsed_cmd := self.parser.match.parseString(event):
# Hardware out
case [["HARDWARE", "OUT"], [key]]: case [["HARDWARE", "OUT"], [key]]:
selection = values[f"HARDWARE OUT||{key}"] selection = values[f"HARDWARE OUT||{key}"]
index = int(key[1]) - 1 index = int(key[1]) - 1
@ -88,6 +96,8 @@ class Window(psg.Window):
) )
case [["HARDWARE", "OUT"], [key], ["FOCUS", "IN"]]: case [["HARDWARE", "OUT"], [key], ["FOCUS", "IN"]]:
self.nvda.speak(f"HARDWARE OUT {key} {self.vm.bus[int(key[-1]) - 1].device.name}") self.nvda.speak(f"HARDWARE OUT {key} {self.vm.bus[int(key[-1]) - 1].device.name}")
# Patch ASIO
case [["ASIO", "CHECKBOX"], [in_num, channel]]: case [["ASIO", "CHECKBOX"], [in_num, channel]]:
index = get_asio_checkbox_index(int(channel), int(in_num[-1])) index = get_asio_checkbox_index(int(channel), int(in_num[-1]))
val = values[f"ASIO CHECKBOX||{in_num} {channel}"] val = values[f"ASIO CHECKBOX||{in_num} {channel}"]
@ -96,10 +106,25 @@ class Window(psg.Window):
self.nvda.speak(f"Patch ASIO {in_num} {channel} set to {val}") self.nvda.speak(f"Patch ASIO {in_num} {channel} set to {val}")
case [["ASIO", "CHECKBOX"], [in_num, channel], ["FOCUS", "IN"]]: case [["ASIO", "CHECKBOX"], [in_num, channel], ["FOCUS", "IN"]]:
val = values[f"ASIO CHECKBOX||{in_num} {channel}"] val = values[f"ASIO CHECKBOX||{in_num} {channel}"]
index = get_asio_checkbox_index(int(channel), int(in_num[-1]))
channel = ("left", "right")[int(channel)] channel = ("left", "right")[int(channel)]
num = int(in_num[-1]) num = int(in_num[-1])
self.nvda.speak(f"Patch ASIO inputs to strips IN#{num} {channel} {val}") self.nvda.speak(f"Patch ASIO inputs to strips IN#{num} {channel} {val}")
# Patch COMPOSITE
case [["PATCH", "COMPOSITE"], [key]]:
val = values[f"PATCH COMPOSITE||{key}"]
index = int(key[-1]) - 1
self.vm.patch.composite[index].set(get_patch_composite_list(self.kind).index(val) + 1)
self.TKroot.after(200, self.nvda.speak, f"PATCH COMPOSITE {key[-1]} set {val}")
case [["PATCH", "COMPOSITE"], [key], ["FOCUS", "IN"]]:
if values[f"PATCH COMPOSITE||{key}"]:
val = values[f"PATCH COMPOSITE||{key}"]
else:
index = int(key[-1]) - 1
val = get_patch_composite_list(self.kind)[self.vm.patch.composite[index].get() - 1]
self.nvda.speak(f"Patch COMPOSITE {key[-1]} {val}")
# Patch INSERT
case [["INSERT", "CHECKBOX"], [in_num, channel]]: case [["INSERT", "CHECKBOX"], [in_num, channel]]:
index = get_insert_checkbox_index( index = get_insert_checkbox_index(
self.kind, self.kind,
@ -127,5 +152,5 @@ class Window(psg.Window):
def request_window_object(title, vm): def request_window_object(title, vm):
WINDOW_cls = Window NVDAVMWindow_cls = NVDAVMWindow
return WINDOW_cls(title, vm) return NVDAVMWindow_cls(title, vm)