mirror of
https://github.com/onyx-and-iris/nvda-addon-voicemeeter.git
synced 2026-04-19 01:23:31 +00:00
slider mode commands split up
config.py added. loads custom user settings _make_gestures moved into util.py
This commit is contained in:
@@ -1,63 +1,16 @@
|
||||
import json
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
import globalPluginHandler
|
||||
from logHandler import log
|
||||
|
||||
from . import config, util
|
||||
from .commands import CommandsMixin
|
||||
from .controller import Controller
|
||||
from .kinds import KindId, request_kind_map
|
||||
|
||||
|
||||
def _make_gestures():
|
||||
defaults = {
|
||||
"kb:NVDA+alt+s": "strip_mode",
|
||||
"kb:NVDA+alt+b": "bus_mode",
|
||||
"kb:NVDA+alt+g": "slider_mode", # Gate
|
||||
"kb:NVDA+alt+c": "slider_mode", # Comp
|
||||
"kb:NVDA+alt+t": "slider_mode", # Gate
|
||||
"kb:NVDA+alt+d": "slider_mode", # Denoiser
|
||||
"kb:NVDA+alt+a": "slider_mode", # Audibility
|
||||
"kb:NVDA+shift+q": "announce_controller",
|
||||
"kb:NVDA+shift+a": "announce_voicemeeter_version",
|
||||
"kb:NVDA+shift+o": "toggle_mono",
|
||||
"kb:NVDA+shift+s": "toggle_solo",
|
||||
"kb:NVDA+shift+m": "toggle_mute",
|
||||
"kb:NVDA+shift+c": "toggle_mc",
|
||||
"kb:NVDA+shift+k": "karaoke",
|
||||
"kb:NVDA+shift+upArrow": "slider_increase",
|
||||
"kb:NVDA+shift+downArrow": "slider_decrease",
|
||||
"kb:NVDA+shift+alt+upArrow": "slider_increase",
|
||||
"kb:NVDA+shift+alt+downArrow": "slider_decrease",
|
||||
"kb:NVDA+shift+control+upArrow": "slider_increase",
|
||||
"kb:NVDA+shift+control+downArrow": "slider_decrease",
|
||||
}
|
||||
|
||||
overrides = None
|
||||
pn = Path.home() / "Documents" / "Voicemeeter" / "keybinds.json"
|
||||
if pn.exists():
|
||||
with open(pn, "r") as f:
|
||||
data = json.load(f)
|
||||
overrides = {f"kb:{v}": k for k, v in data.items()}
|
||||
log.info("INFO - loading settings from keybinds.json")
|
||||
if overrides:
|
||||
return {**defaults, **overrides}
|
||||
return defaults
|
||||
|
||||
|
||||
def _get_kind_id():
|
||||
pn = Path.home() / "Documents" / "Voicemeeter" / "settings.json"
|
||||
if pn.exists():
|
||||
with open(pn, "r") as f:
|
||||
data = json.load(f)
|
||||
return data["voicemeeter"]
|
||||
return "potato"
|
||||
|
||||
|
||||
class GlobalPlugin(globalPluginHandler.GlobalPlugin, CommandsMixin):
|
||||
__gestures = _make_gestures()
|
||||
__kind_id = _get_kind_id()
|
||||
__kind_id = config.get("voicemeeter", "potato")
|
||||
__gestures = util._make_gestures(__kind_id)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
@@ -65,12 +18,7 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin, CommandsMixin):
|
||||
if self.controller.login() == 1:
|
||||
self.controller.run_voicemeeter(KindId[self.__kind_id.upper()])
|
||||
time.sleep(1)
|
||||
self.kind = request_kind_map(self.controller.kind_id)
|
||||
|
||||
for i in range(1, self.kind.num_strip + 1):
|
||||
self.bindGesture(f"kb:NVDA+alt+{i}", "index")
|
||||
for i in range(1, self.kind.phys_out + self.kind.virt_out + 1):
|
||||
self.bindGesture(f"kb:NVDA+shift+{i}", "bus_assignment")
|
||||
self.kind = request_kind_map(self.__kind_id)
|
||||
|
||||
def terminate(self, *args, **kwargs):
|
||||
super().terminate(*args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user