onyx_online/nvda-addon-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-addon-voicemeeter.git synced 2025-02-22 21:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-run through ruff formatter

Browse Source
This commit is contained in:
Onyx and Iris 2025-01-23 20:04:48 +00:00
parent 1b5cfacf4f
commit b090c359b4
9 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/globalPlugins/voicemeeter/__init__.py
View File

@ -9,7 +9,7 @@ from .kinds import KindId, request_kind_map
class GlobalPlugin(CommandsMixin, globalPluginHandler.GlobalPlugin): class GlobalPlugin(CommandsMixin, globalPluginHandler.GlobalPlugin):
__kind_id = config.get("voicemeeter", "potato") __kind_id = config.get('voicemeeter', 'potato')
__gestures = util._make_gestures(__kind_id) __gestures = util._make_gestures(__kind_id)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

28
addon/globalPlugins/voicemeeter/cdll.py
View File

@ -7,41 +7,41 @@ from .error import VMError
BITS = 64 if ct.sizeof(ct.c_voidp) == 8 else 32 BITS = 64 if ct.sizeof(ct.c_voidp) == 8 else 32
if platform.system() != "Windows": if platform.system() != 'Windows':
raise VMError("Only Windows OS supported") raise VMError('Only Windows OS supported')
VM_KEY = "VB:Voicemeeter {17359A74-1236-5467}" VM_KEY = 'VB:Voicemeeter {17359A74-1236-5467}'
REG_KEY = "\\".join( REG_KEY = '\\'.join(
filter( filter(
None, None,
( (
"SOFTWARE", 'SOFTWARE',
"WOW6432Node" if BITS == 64 else "", 'WOW6432Node' if BITS == 64 else '',
"Microsoft", 'Microsoft',
"Windows", 'Windows',
"CurrentVersion", 'CurrentVersion',
"Uninstall", 'Uninstall',
), ),
) )
) )
def get_vmpath(): def get_vmpath():
with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"{}".format("\\".join((REG_KEY, VM_KEY)))) as vm_key: with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'{}'.format('\\'.join((REG_KEY, VM_KEY)))) as vm_key:
return winreg.QueryValueEx(vm_key, r"UninstallString")[0] return winreg.QueryValueEx(vm_key, r'UninstallString')[0]
try: try:
vm_parent = Path(get_vmpath()).parent vm_parent = Path(get_vmpath()).parent
except FileNotFoundError as e: except FileNotFoundError as e:
raise VMError("Unable to fetch DLL path from the registry") from e raise VMError('Unable to fetch DLL path from the registry') from e
DLL_NAME = f'VoicemeeterRemote{"64" if BITS == 64 else ""}.dll' DLL_NAME = f'VoicemeeterRemote{"64" if BITS == 64 else ""}.dll'
dll_path = vm_parent.joinpath(DLL_NAME) dll_path = vm_parent.joinpath(DLL_NAME)
if not dll_path.is_file(): if not dll_path.is_file():
raise VMError(f"Could not find {dll_path}") raise VMError(f'Could not find {dll_path}')
if BITS == 64: if BITS == 64:
libc = ct.CDLL(str(dll_path)) libc = ct.CDLL(str(dll_path))

68
addon/globalPlugins/voicemeeter/commands.py
View File

@ -8,93 +8,93 @@ class CommandsMixin:
### ANNOUNCEMENTS ### ### ANNOUNCEMENTS ###
def script_announce_voicemeeter_version(self, _): def script_announce_voicemeeter_version(self, _):
ui.message(f"Running Voicemeeter {self.kind} {self.controller.version}") ui.message(f'Running Voicemeeter {self.kind} {self.controller.version}')
def script_announce_controller(self, _): def script_announce_controller(self, _):
ui.message(f"Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}") ui.message(f'Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}')
### ALTER THE CONTEXT ### ### ALTER THE CONTEXT ###
def script_strip_mode(self, _): def script_strip_mode(self, _):
if self.controller.ctx.index >= self.kind.num_strip: if self.controller.ctx.index >= self.kind.num_strip:
ui.message(f"Controller strip {self.controller.ctx.index + 1} does not exist for Voicemeeter {self.kind}") ui.message(f'Controller strip {self.controller.ctx.index + 1} does not exist for Voicemeeter {self.kind}')
return return
self.controller.ctx.strategy = context.StripStrategy(self.controller, self.controller.ctx.index) self.controller.ctx.strategy = context.StripStrategy(self.controller, self.controller.ctx.index)
ui.message(f"Controller for strip {self.controller.ctx.index + 1}") ui.message(f'Controller for strip {self.controller.ctx.index + 1}')
log.info(f"INFO - strip {self.controller.ctx.index} mode") log.info(f'INFO - strip {self.controller.ctx.index} mode')
def script_bus_mode(self, _): def script_bus_mode(self, _):
if self.controller.ctx.index >= self.kind.num_bus: if self.controller.ctx.index >= self.kind.num_bus:
ui.message(f"Controller bus {self.controller.ctx.index + 1} does not exist for Voicemeeter {self.kind}") ui.message(f'Controller bus {self.controller.ctx.index + 1} does not exist for Voicemeeter {self.kind}')
return return
self.controller.ctx.strategy = context.BusStrategy(self.controller, self.controller.ctx.index) self.controller.ctx.strategy = context.BusStrategy(self.controller, self.controller.ctx.index)
ui.message(f"Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}") ui.message(f'Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}')
log.info(f"INFO - {self.controller.ctx.strategy} {self.controller.ctx.index} mode") log.info(f'INFO - {self.controller.ctx.strategy} {self.controller.ctx.index} mode')
def script_index(self, gesture): def script_index(self, gesture):
proposed = int(gesture.displayName[-1]) proposed = int(gesture.displayName[-1])
self.controller.ctx.index = proposed - 1 self.controller.ctx.index = proposed - 1
ui.message(f"Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}") ui.message(f'Controller for {self.controller.ctx.strategy} {self.controller.ctx.index + 1}')
log.info(f"INFO - {self.controller.ctx.strategy} {self.controller.ctx.index} mode") log.info(f'INFO - {self.controller.ctx.strategy} {self.controller.ctx.index} mode')
def __set_slider_mode(self, mode): def __set_slider_mode(self, mode):
self.controller.ctx.slider_mode = mode self.controller.ctx.slider_mode = mode
ui.message(f"{mode} mode enabled") ui.message(f'{mode} mode enabled')
def script_gain_mode(self, _): def script_gain_mode(self, _):
self.__set_slider_mode("gain") self.__set_slider_mode('gain')
def script_comp_mode(self, _): def script_comp_mode(self, _):
self.__set_slider_mode("comp") self.__set_slider_mode('comp')
def script_gate_mode(self, _): def script_gate_mode(self, _):
self.__set_slider_mode("gate") self.__set_slider_mode('gate')
def script_denoiser_mode(self, _): def script_denoiser_mode(self, _):
self.__set_slider_mode("denoiser") self.__set_slider_mode('denoiser')
def script_audibility_mode(self, _): def script_audibility_mode(self, _):
self.__set_slider_mode("audibility") self.__set_slider_mode('audibility')
### BOOLEAN PARAMETERS ### ### BOOLEAN PARAMETERS ###
def script_toggle_mono(self, _): def script_toggle_mono(self, _):
val = not self.controller.ctx.get_bool("mono") val = not self.controller.ctx.get_bool('mono')
self.controller.ctx.set_bool("mono", val) self.controller.ctx.set_bool('mono', val)
ui.message("on" if val else "off") ui.message('on' if val else 'off')
def script_toggle_solo(self, _): def script_toggle_solo(self, _):
val = not self.controller.ctx.get_bool("solo") val = not self.controller.ctx.get_bool('solo')
self.controller.ctx.set_bool("solo", val) self.controller.ctx.set_bool('solo', val)
ui.message("on" if val else "off") ui.message('on' if val else 'off')
def script_toggle_mute(self, _): def script_toggle_mute(self, _):
val = not self.controller.ctx.get_bool("mute") val = not self.controller.ctx.get_bool('mute')
self.controller.ctx.set_bool("mute", val) self.controller.ctx.set_bool('mute', val)
ui.message("on" if val else "off") ui.message('on' if val else 'off')
def script_toggle_mc(self, _): def script_toggle_mc(self, _):
val = not self.controller.ctx.get_bool("mc") val = not self.controller.ctx.get_bool('mc')
self.controller.ctx.set_bool("mc", val) self.controller.ctx.set_bool('mc', val)
ui.message("on" if val else "off") ui.message('on' if val else 'off')
def script_karaoke(self, _): def script_karaoke(self, _):
opts = ["off", "k m", "k 1", "k 2", "k v"] opts = ['off', 'k m', 'k 1', 'k 2', 'k v']
val = self.controller.ctx.get_int("karaoke") + 1 val = self.controller.ctx.get_int('karaoke') + 1
if val == len(opts): if val == len(opts):
val = 0 val = 0
self.controller.ctx.set_int("karaoke", val) self.controller.ctx.set_int('karaoke', val)
ui.message(opts[val]) ui.message(opts[val])
def script_bus_assignment(self, gesture): def script_bus_assignment(self, gesture):
proposed = int(gesture.displayName[-1]) proposed = int(gesture.displayName[-1])
if proposed - 1 < self.kind.phys_out: if proposed - 1 < self.kind.phys_out:
output = f"A{proposed}" output = f'A{proposed}'
else: else:
output = f"B{proposed - self.kind.phys_out}" output = f'B{proposed - self.kind.phys_out}'
val = not self.controller.ctx.get_bool(output) val = not self.controller.ctx.get_bool(output)
self.controller.ctx.set_bool(output, val) self.controller.ctx.set_bool(output, val)
ui.message("on" if val else "off") ui.message('on' if val else 'off')
### CONTROL SLIDERS ### ### CONTROL SLIDERS ###

4
addon/globalPlugins/voicemeeter/config.py
View File

@ -3,10 +3,10 @@ from pathlib import Path
def config_from_json(): def config_from_json():
pn = Path.home() / "Documents" / "Voicemeeter" / "nvda_settings.json" pn = Path.home() / 'Documents' / 'Voicemeeter' / 'nvda_settings.json'
data = None data = None
if pn.exists(): if pn.exists():
with open(pn, "r") as f: with open(pn, 'r') as f:
data = json.load(f) data = json.load(f)
return data or {} return data or {}

22
addon/globalPlugins/voicemeeter/context.py
View File

@ -5,7 +5,7 @@ class Strategy(ABC):
def __init__(self, controller, index): def __init__(self, controller, index):
self._controller = controller self._controller = controller
self._index = index self._index = index
self._slider_mode = "gain" self._slider_mode = 'gain'
@abstractmethod @abstractmethod
def identifier(self): def identifier(self):
@ -28,40 +28,40 @@ class Strategy(ABC):
self._slider_mode = val self._slider_mode = val
def get_bool(self, param: str) -> bool: def get_bool(self, param: str) -> bool:
return self._controller._get(f"{self.identifier}.{param}") == 1 return self._controller._get(f'{self.identifier}.{param}') == 1
def set_bool(self, param: str, val: bool): def set_bool(self, param: str, val: bool):
self._controller._set(f"{self.identifier}.{param}", 1 if val else 0) self._controller._set(f'{self.identifier}.{param}', 1 if val else 0)
def get_float(self, param: str) -> float: def get_float(self, param: str) -> float:
return round(self._controller._get(f"{self.identifier}.{param}"), 1) return round(self._controller._get(f'{self.identifier}.{param}'), 1)
def set_float(self, param: str, val: float): def set_float(self, param: str, val: float):
self._controller._set(f"{self.identifier}.{param}", val) self._controller._set(f'{self.identifier}.{param}', val)
def get_int(self, param: str) -> int: def get_int(self, param: str) -> int:
return int(self._controller._get(f"{self.identifier}.{param}")) return int(self._controller._get(f'{self.identifier}.{param}'))
def set_int(self, param: str, val: int): def set_int(self, param: str, val: int):
self._controller._set(f"{self.identifier}.{param}", val) self._controller._set(f'{self.identifier}.{param}', val)
class StripStrategy(Strategy): class StripStrategy(Strategy):
def __str__(self): def __str__(self):
return "Strip" return 'Strip'
@property @property
def identifier(self): def identifier(self):
return f"{self}[{self._index}]" return f'{self}[{self._index}]'
class BusStrategy(Strategy): class BusStrategy(Strategy):
def __str__(self): def __str__(self):
return "Bus" return 'Bus'
@property @property
def identifier(self): def identifier(self):
return f"{self}[{self._index}]" return f'{self}[{self._index}]'
class Context: class Context:

6
addon/globalPlugins/voicemeeter/controller.py
View File

@ -14,12 +14,12 @@ class Controller(Binds):
def login(self): def login(self):
retval = self.call(self.bind_login, ok=(0, 1)) retval = self.call(self.bind_login, ok=(0, 1))
log.info("INFO - logged into Voicemeeter Remote API") log.info('INFO - logged into Voicemeeter Remote API')
return retval return retval
def logout(self): def logout(self):
self.call(self.bind_logout) self.call(self.bind_logout)
log.info("NFO - logged out of Voicemeeter Remote API") log.info('NFO - logged out of Voicemeeter Remote API')
@property @property
def kind_id(self): def kind_id(self):
@ -31,7 +31,7 @@ class Controller(Binds):
def version(self): def version(self):
ver = ct.c_long() ver = ct.c_long()
self.call(self.bind_get_voicemeeter_version, ct.byref(ver)) self.call(self.bind_get_voicemeeter_version, ct.byref(ver))
return "{}.{}.{}.{}".format( return '{}.{}.{}.{}'.format(
(ver.value & 0xFF000000) >> 24, (ver.value & 0xFF000000) >> 24,
(ver.value & 0x00FF0000) >> 16, (ver.value & 0x00FF0000) >> 16,
(ver.value & 0x0000FF00) >> 8, (ver.value & 0x0000FF00) >> 8,

2
addon/globalPlugins/voicemeeter/error.py
View File

@ -8,4 +8,4 @@ class VMCAPIError(VMError):
def __init__(self, fn_name, code): def __init__(self, fn_name, code):
self.fn_name = fn_name self.fn_name = fn_name
self.code = code self.code = code
super().__init__(f"{self.fn_name} returned {self.code}") super().__init__(f'{self.fn_name} returned {self.code}')

8
addon/globalPlugins/voicemeeter/kinds.py
View File

@ -79,14 +79,14 @@ class PotatoMap(KindMapClass):
def kind_factory(kind_id): def kind_factory(kind_id):
if kind_id == "basic": if kind_id == 'basic':
_kind_map = BasicMap _kind_map = BasicMap
elif kind_id == "banana": elif kind_id == 'banana':
_kind_map = BananaMap _kind_map = BananaMap
elif kind_id == "potato": elif kind_id == 'potato':
_kind_map = PotatoMap _kind_map = PotatoMap
else: else:
raise ValueError(f"Unknown Voicemeeter kind {kind_id}") raise ValueError(f'Unknown Voicemeeter kind {kind_id}')
return _kind_map(name=kind_id) return _kind_map(name=kind_id)

48
addon/globalPlugins/voicemeeter/util.py
View File

@ -17,34 +17,34 @@ def remove_suffix(input_string, suffix):
def _make_gestures(kind_id): def _make_gestures(kind_id):
kind = request_kind_map(kind_id) kind = request_kind_map(kind_id)
defaults = { defaults = {
"kb:NVDA+alt+s": "strip_mode", 'kb:NVDA+alt+s': 'strip_mode',
"kb:NVDA+alt+b": "bus_mode", 'kb:NVDA+alt+b': 'bus_mode',
"kb:NVDA+alt+g": "gain_mode", 'kb:NVDA+alt+g': 'gain_mode',
"kb:NVDA+alt+c": "comp_mode", 'kb:NVDA+alt+c': 'comp_mode',
"kb:NVDA+alt+t": "gate_mode", 'kb:NVDA+alt+t': 'gate_mode',
"kb:NVDA+alt+d": "denoiser_mode", 'kb:NVDA+alt+d': 'denoiser_mode',
"kb:NVDA+alt+a": "audibility_mode", 'kb:NVDA+alt+a': 'audibility_mode',
"kb:NVDA+shift+q": "announce_controller", 'kb:NVDA+shift+q': 'announce_controller',
"kb:NVDA+shift+v": "announce_voicemeeter_version", 'kb:NVDA+shift+v': 'announce_voicemeeter_version',
"kb:NVDA+shift+o": "toggle_mono", 'kb:NVDA+shift+o': 'toggle_mono',
"kb:NVDA+shift+s": "toggle_solo", 'kb:NVDA+shift+s': 'toggle_solo',
"kb:NVDA+shift+m": "toggle_mute", 'kb:NVDA+shift+m': 'toggle_mute',
"kb:NVDA+shift+c": "toggle_mc", 'kb:NVDA+shift+c': 'toggle_mc',
"kb:NVDA+shift+k": "karaoke", 'kb:NVDA+shift+k': 'karaoke',
"kb:NVDA+shift+upArrow": "slider_increase_by_point_one", 'kb:NVDA+shift+upArrow': 'slider_increase_by_point_one',
"kb:NVDA+shift+downArrow": "slider_decrease_by_point_one", 'kb:NVDA+shift+downArrow': 'slider_decrease_by_point_one',
"kb:NVDA+shift+alt+upArrow": "slider_increase_by_one", 'kb:NVDA+shift+alt+upArrow': 'slider_increase_by_one',
"kb:NVDA+shift+alt+downArrow": "slider_decrease_by_one", 'kb:NVDA+shift+alt+downArrow': 'slider_decrease_by_one',
"kb:NVDA+shift+control+upArrow": "slider_increase_by_three", 'kb:NVDA+shift+control+upArrow': 'slider_increase_by_three',
"kb:NVDA+shift+control+downArrow": "slider_decrease_by_three", 'kb:NVDA+shift+control+downArrow': 'slider_decrease_by_three',
} }
for i in range(1, kind.num_strip + 1): for i in range(1, kind.num_strip + 1):
defaults[f"kb:NVDA+alt+{i}"] = "index" defaults[f'kb:NVDA+alt+{i}'] = 'index'
for i in range(1, kind.phys_out + kind.virt_out + 1): for i in range(1, kind.phys_out + kind.virt_out + 1):
defaults[f"kb:NVDA+shift+{i}"] = "bus_assignment" defaults[f'kb:NVDA+shift+{i}'] = 'bus_assignment'
abc = config.get("keybinds") abc = config.get('keybinds')
if abc: if abc:
overrides = {f"kb:{remove_prefix(k, 'kb:')}": v for k, v in abc.items()} overrides = {f'kb:{remove_prefix(k, "kb:")}': v for k, v in abc.items()}
matching_values = set(defaults.values()).intersection(set(overrides.values())) matching_values = set(defaults.values()).intersection(set(overrides.values()))
defaults = {k: v for k, v in defaults.items() if v not in matching_values} defaults = {k: v for k, v in defaults.items() if v not in matching_values}
return {**defaults, **overrides} return {**defaults, **overrides}