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

parameter updates implemented.

Browse Source 
More testing required.
This commit is contained in:
onyx-and-iris 2023-09-05 05:30:46 +01:00
parent 5d8eda4976
commit abdab7403a
4 changed files with 110 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvda_voicemeeter/builder.py
View File

@ -106,7 +106,7 @@ class Builder:
[ [
psg.Spin( psg.Spin(
nums, nums,
initial_value=self.vm.patch.asio[get_asio_checkbox_index(0, i)].get(), initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{get_asio_checkbox_index(0, i)}"],
size=2, size=2,
enable_events=True, enable_events=True,
key=f"ASIO CHECKBOX||IN{i} 0", key=f"ASIO CHECKBOX||IN{i} 0",
@ -117,7 +117,7 @@ class Builder:
[ [
psg.Spin( psg.Spin(
nums, nums,
initial_value=self.vm.patch.asio[get_asio_checkbox_index(1, i)].get(), initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{get_asio_checkbox_index(1, i)}"],
size=2, size=2,
enable_events=True, enable_events=True,
key=f"ASIO CHECKBOX||IN{i} 1", key=f"ASIO CHECKBOX||IN{i} 1",
@ -239,7 +239,7 @@ class Builder:
outputs = list() outputs = list()
[step(outputs) for step in (add_strip_outputs,)] [step(outputs) for step in (add_strip_outputs,)]
return psg.Frame(self.window.cache["labels"]["strip"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL") return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL")
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_in)] layout = [[self.make_tab1_row(i)] for i in range(self.kind.phys_in)]
@ -264,22 +264,22 @@ class Builder:
outputs = list() outputs = list()
[step(outputs) for step in (add_strip_outputs,)] [step(outputs) for step in (add_strip_outputs,)]
return psg.Frame(self.window.cache["labels"]["strip"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL") return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL")
def make_tab2_rows(self) -> psg.Frame: def make_tab2_rows(self) -> psg.Frame:
layout = [[self.make_tab2_row(i)] for i in range(self.kind.phys_in, self.kind.phys_in + self.kind.virt_in)] layout = [[self.make_tab2_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)
def make_tab3_row(self, i): def make_tab3_row(self, i) -> psg.Frame:
"""tab3 row represents bus composite toggle""" """tab3 row represents bus composite toggle"""
def add_strip_outputs(layout): def add_strip_outputs(layout):
layout.append([psg.Button(f"BUSMODE", size=(12, 2), key=f"BUS {i}||MODE")]) layout.append([psg.Button(f"BUSMODE", size=(12, 2), key=f"BUS {i}||MODE")])
buses = list() outputs = list()
[step(buses) for step in (add_strip_outputs,)] [step(outputs) for step in (add_strip_outputs,)]
return psg.Frame(self.window.cache["labels"]["bus"][f"BUS {i}||LABEL"], buses) return psg.Frame(self.window.cache["labels"][f"BUS {i}||LABEL"], outputs, key=f"BUS {i}||LABEL")
def make_tab3_rows(self): def make_tab3_rows(self) -> psg.Frame:
layout = [[self.make_tab3_row(i)] for i in range(self.kind.num_bus)] layout = [[self.make_tab3_row(i)] for i in range(self.kind.num_bus)]
return psg.Frame(None, layout, border_width=0) return psg.Frame(None, layout, border_width=0)

46
src/nvda_voicemeeter/models.py
View File

@ -1,3 +1,7 @@
def _make_hardware_outs_cache(vm) -> dict:
pass
def _make_output_cache(vm) -> dict: def _make_output_cache(vm) -> dict:
match vm.kind.name: match vm.kind.name:
case "basic": case "basic":
@ -32,26 +36,28 @@ def _make_bus_mode_cache(vm) -> dict:
def _make_label_cache(vm) -> dict: def _make_label_cache(vm) -> dict:
return { return {
"strip": { **{
**{ f"STRIP {i}||LABEL": vm.strip[i].label if vm.strip[i].label else f"Hardware Input {i + 1}"
f"STRIP {i}||LABEL": vm.strip[i].label if vm.strip[i].label else f"Hardware Input {i + 1}" for i in range(vm.kind.phys_in)
for i in range(vm.kind.phys_in)
},
**{
f"STRIP {i}||LABEL": vm.strip[i].label
if vm.strip[i].label
else f"Virtual Input {i - vm.kind.phys_in + 1}"
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in)
},
}, },
"bus": { **{
**{ f"STRIP {i}||LABEL": vm.strip[i].label if vm.strip[i].label else f"Virtual Input {i - vm.kind.phys_in + 1}"
f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Physical Bus {i + 1}" for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in)
for i in range(vm.kind.phys_out) },
}, **{
**{ f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Physical Bus {i + 1}"
f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Virtual Bus {i - vm.kind.phys_out + 1}" for i in range(vm.kind.phys_out)
for i in range(vm.kind.phys_out, vm.kind.phys_out + vm.kind.virt_out) },
}, **{
f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Virtual Bus {i - vm.kind.phys_out + 1}"
for i in range(vm.kind.phys_out, vm.kind.phys_out + vm.kind.virt_out)
}, },
} }
def _make_patch_asio_cache(vm) -> dict:
return {**{f"ASIO CHECKBOX||{i}": vm.patch.asio[i].get() for i in range(vm.kind.phys_out * 2)}}
def _make_patch_insert_cache(vm) -> dict:
return {**{f"INSERT CHECKBOX||{i}": vm.patch.insert[i].on for i in range(vm.kind.num_strip_levels)}}

11
src/nvda_voicemeeter/util.py
View File

@ -77,3 +77,14 @@ def open_context_menu_for_buttonmenu(window, identifier) -> None:
x = widget.winfo_rootx() x = widget.winfo_rootx()
y = widget.winfo_rooty() + widget.winfo_height() y = widget.winfo_rooty() + widget.winfo_height()
element.TKMenu.post(x, y) element.TKMenu.post(x, y)
def get_channel_identifier_list(vm) -> list:
identifiers = []
for i in range(vm.kind.phys_in):
for j in range(2):
identifiers.append(f"IN{i + 1} {j}")
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in):
for j in range(8):
identifiers.append(f"IN{i + 1} {j}")
return identifiers

82
src/nvda_voicemeeter/window.py
View File

@ -5,12 +5,20 @@ from pathlib import Path
import PySimpleGUI as psg import PySimpleGUI as psg
from .builder import Builder from .builder import Builder
from .models import _make_bus_mode_cache, _make_label_cache, _make_output_cache from .models import (
_make_bus_mode_cache,
_make_hardware_outs_cache,
_make_label_cache,
_make_output_cache,
_make_patch_asio_cache,
_make_patch_insert_cache,
)
from .nvda import Nvda from .nvda import Nvda
from .parser import Parser from .parser import Parser
from .util import ( from .util import (
_patch_insert_channels, _patch_insert_channels,
get_asio_checkbox_index, get_asio_checkbox_index,
get_channel_identifier_list,
get_insert_checkbox_index, get_insert_checkbox_index,
get_patch_composite_list, get_patch_composite_list,
open_context_menu_for_buttonmenu, open_context_menu_for_buttonmenu,
@ -34,6 +42,8 @@ class NVDAVMWindow(psg.Window):
"outputs": _make_output_cache(self.vm), "outputs": _make_output_cache(self.vm),
"busmode": _make_bus_mode_cache(self.vm), "busmode": _make_bus_mode_cache(self.vm),
"labels": _make_label_cache(self.vm), "labels": _make_label_cache(self.vm),
"asio": _make_patch_asio_cache(self.vm),
"insert": _make_patch_insert_cache(self.vm),
} }
self.nvda = Nvda() self.nvda = Nvda()
self.parser = Parser() self.parser = Parser()
@ -49,28 +59,56 @@ class NVDAVMWindow(psg.Window):
self.register_events() self.register_events()
def __enter__(self): def __enter__(self):
default_config = Path.cwd() / self.SETTINGS settings_path = Path.cwd() / self.SETTINGS
if default_config.exists(): if settings_path.exists():
try: try:
with open(default_config, "r") as f: with open(settings_path, "r") as f:
data = json.load(f) data = json.load(f)
configpath = Path(data["default_config"]) defaultconfig = Path(data["default_config"])
if configpath.exists(): if defaultconfig.exists():
self.vm.set("command.load", str(configpath)) self.vm.set("command.load", str(defaultconfig))
self.logger.debug(f"config {configpath} loaded") self.logger.debug(f"config {defaultconfig} loaded")
self.TKroot.after( self.TKroot.after(
200, 200,
self.nvda.speak, self.nvda.speak,
f"config {configpath.stem} has been loaded", f"config {defaultconfig.stem} has been loaded",
) )
except json.JSONDecodeError: except json.JSONDecodeError:
self.logger.debug("no data in settings.json. silently continuing...") self.logger.debug("no data in settings.json. silently continuing...")
self.vm.init_thread()
self.vm.observer.add(self.on_pdirty)
self.TKroot.after(1000, self.enable_parameter_updates)
return self return self
def enable_parameter_updates(self):
self.vm.event.pdirty = True
def __exit__(self, exc_type, exc_value, traceback): def __exit__(self, exc_type, exc_value, traceback):
self.vm.end_thread()
self.close() self.close()
def on_pdirty(self):
self.cache = {
"outputs": _make_output_cache(self.vm),
"busmode": _make_bus_mode_cache(self.vm),
"labels": _make_label_cache(self.vm),
"asio": _make_patch_asio_cache(self.vm),
"insert": _make_patch_insert_cache(self.vm),
}
for key, value in self.cache["labels"].items():
self[key].update(value=value)
for key, value in self.cache["asio"].items():
identifier, i = key.split("||")
in_num = int(int(i) / 2) + 1
channel = int(i) % 2
self[f"{identifier}||IN{in_num} {channel}"].update(value=value)
for key, value in self.cache["insert"].items():
identifier, i = key.split("||")
partial = get_channel_identifier_list(self.vm)[int(i)]
self[f"{identifier}||{partial}"].update(value=value)
def register_events(self): def register_events(self):
"""Registers events for widgets""" """Registers events for widgets"""
@ -244,20 +282,28 @@ class NVDAVMWindow(psg.Window):
tab = values["tabs"] tab = values["tabs"]
if tab in ("Physical Strip", "Virtual Strip", "Buses"): if tab in ("Physical Strip", "Virtual Strip", "Buses"):
data = self.popup_rename("Label", title=f"Rename {tab}", tab=tab) data = self.popup_rename("Label", title=f"Rename {tab}", tab=tab)
if not data: if not data: # cancel was pressed
continue continue
index = int(data["Index"]) - 1 index = int(data["Index"]) - 1
match tab: match tab:
case "Physical Strip" | "Virtual Strip": case "Physical Strip":
label = data.get("Edit") or self.cache["labels"]["strip"][f"STRIP {index}||LABEL"] label = data.get("Edit") or f"Hardware Input {index + 1}"
self.vm.strip[index].label = label self.vm.strip[index].label = label
self[f"STRIP {index}||LABEL"].update(value=label) self[f"STRIP {index}||LABEL"].update(value=label)
self.cache["labels"]["strip"][f"STRIP {index}||LABEL"] = label self.cache["labels"][f"STRIP {index}||LABEL"] = label
case "Virtual Strip":
label = data.get("Edit") or f"Virtual Input {index + 1}"
self.vm.strip[index].label = label
self[f"STRIP {index}||LABEL"].update(value=label)
self.cache["labels"][f"STRIP {index}||LABEL"] = label
case "Buses": case "Buses":
label = data.get("Edit") or self.cache["labels"]["bus"][f"BUS {index}||LABEL"] if index < self.kind.phys_out:
label = data.get("Edit") or f"Physical Bus {index + 1}"
else:
label = data.get("Edit") or f"Virtual Bus {index - self.kind.phys_out + 1}"
self.vm.bus[index].label = label self.vm.bus[index].label = label
self[f"BUS {index}||LABEL"].update(value=label) self[f"BUS {index}||LABEL"].update(value=label)
self.cache["labels"]["bus"][f"BUS {index}||LABEL"] = label self.cache["labels"][f"BUS {index}||LABEL"] = label
# Menus # Menus
case [["Restart", "Audio", "Engine"], ["MENU"]]: case [["Restart", "Audio", "Engine"], ["MENU"]]:
@ -418,7 +464,7 @@ class NVDAVMWindow(psg.Window):
self.nvda.speak(f"STRIP {index} {output} {label if label else ''} {'on' if val else 'off'}") self.nvda.speak(f"STRIP {index} {output} {label if label else ''} {'on' if val else 'off'}")
case [["STRIP", index], [output], ["FOCUS", "IN"]]: case [["STRIP", index], [output], ["FOCUS", "IN"]]:
val = self.cache["outputs"][f"STRIP {index}||{output}"] val = self.cache["outputs"][f"STRIP {index}||{output}"]
label = self.cache["labels"]["strip"][f"STRIP {index}||LABEL"] label = self.cache["labels"][f"STRIP {index}||LABEL"]
self.nvda.speak(f"{label} {output} {'on' if val else 'off'}") self.nvda.speak(f"{label} {output} {'on' if val else 'off'}")
case [["STRIP", index], [output], ["KEY", "ENTER"]]: case [["STRIP", index], [output], ["KEY", "ENTER"]]:
self.find_element_with_focus().click() self.find_element_with_focus().click()
@ -432,14 +478,14 @@ class NVDAVMWindow(psg.Window):
else: else:
self.vm.bus[int(index)].mode.composite = True self.vm.bus[int(index)].mode.composite = True
self.cache["busmode"][event] = "composite" self.cache["busmode"][event] = "composite"
label = self.cache["labels"]["bus"][f"BUS {index}||LABEL"] label = self.cache["labels"][f"BUS {index}||LABEL"]
self.TKroot.after( self.TKroot.after(
200, 200,
self.nvda.speak, self.nvda.speak,
f"{label} bus mode {self.cache['busmode'][event]}", f"{label} bus mode {self.cache['busmode'][event]}",
) )
case [["BUS", index], ["MODE"], ["FOCUS", "IN"]]: case [["BUS", index], ["MODE"], ["FOCUS", "IN"]]:
label = self.cache["labels"]["bus"][f"BUS {index}||LABEL"] label = self.cache["labels"][f"BUS {index}||LABEL"]
self.nvda.speak(f"{label} bus mode {self.cache['busmode'][f'BUS {index}||MODE']}") self.nvda.speak(f"{label} bus mode {self.cache['busmode'][f'BUS {index}||MODE']}")
case [["BUS", index], ["MODE"], ["KEY", "ENTER"]]: case [["BUS", index], ["MODE"], ["KEY", "ENTER"]]:
self.find_element_with_focus().click() self.find_element_with_focus().click()