onyx_online/nvda-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-voicemeeter.git synced 2025-04-19 20:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: onyx_online:719328c6de4a49aaa73c47cf3da69c6bb05027f1
Branches Tags
onyx_online:dev
onyx_online:add-theme-support
onyx_online:add-patch-bus-to-a1
onyx_online:implement-busmode-buttonmenus
onyx_online:add-gate-popup
onyx_online:add-compressor-popup
onyx_online:main
onyx_online:implement-up-down-slider-mode-binds
onyx_online:add-nav-binds
onyx_online:remove-rename-popup-spinbox
onyx_online:add-param-sliders
onyx_online:add-gain-sliders
onyx_online:add-advanced-settings
onyx_online:ml-1
onyx_online:v1.0.0
onyx_online:v0.6.4
onyx_online:v0.6.3
onyx_online:v0.6.1
onyx_online:v0.6.0
onyx_online:v0.5.7.b2
onyx_online:v0.5.7b1
onyx_online:v0.5.7a1
onyx_online:v0.5.6
onyx_online:v0.5.6b1
onyx_online:v.0.5.5
onyx_online:v.0.5.2
onyx_online:v.0.5.1
onyx_online:v.0.5.0
onyx_online:v.0.5.0.b1
onyx_online:v.0.4.1
onyx_online:v.0.4.0
onyx_online:v.0.3.1
onyx_online:v.0.3.0.b1
onyx_online:v.0.3.0
onyx_online:v.0.2.2.a1
onyx_online:v.0.2.2
onyx_online:v.0.2.1.b2
onyx_online:v.0.2.1.b1
onyx_online:v.0.2.1.a3
onyx_online:v.0.2.1
onyx_online:v.0.2.0
onyx_online:v.0.1.5
onyx_online:v.0.1.4
onyx_online:v.0.1.3
onyx_online:v0.1.2
onyx_online:v0.1.1
onyx_online:v0.1.0
..
compare: onyx_online:e35bad9e1ec9deaa0dd252db97e1a26d4ac731f7
Branches Tags
onyx_online:dev
onyx_online:add-theme-support
onyx_online:add-patch-bus-to-a1
onyx_online:implement-busmode-buttonmenus
onyx_online:add-gate-popup
onyx_online:add-compressor-popup
onyx_online:main
onyx_online:implement-up-down-slider-mode-binds
onyx_online:add-nav-binds
onyx_online:remove-rename-popup-spinbox
onyx_online:add-param-sliders
onyx_online:add-gain-sliders
onyx_online:add-advanced-settings
onyx_online:ml-1
onyx_online:v1.0.0
onyx_online:v0.6.4
onyx_online:v0.6.3
onyx_online:v0.6.1
onyx_online:v0.6.0
onyx_online:v0.5.7.b2
onyx_online:v0.5.7b1
onyx_online:v0.5.7a1
onyx_online:v0.5.6
onyx_online:v0.5.6b1
onyx_online:v.0.5.5
onyx_online:v.0.5.2
onyx_online:v.0.5.1
onyx_online:v.0.5.0
onyx_online:v.0.5.0.b1
onyx_online:v.0.4.1
onyx_online:v.0.4.0
onyx_online:v.0.3.1
onyx_online:v.0.3.0.b1
onyx_online:v.0.3.0
onyx_online:v.0.2.2.a1
onyx_online:v.0.2.2
onyx_online:v.0.2.1.b2
onyx_online:v.0.2.1.b1
onyx_online:v.0.2.1.a3
onyx_online:v.0.2.1
onyx_online:v.0.2.0
onyx_online:v.0.1.5
onyx_online:v.0.1.4
onyx_online:v.0.1.3
onyx_online:v0.1.2
onyx_online:v0.1.1
onyx_online:v0.1.0

No commits in common. "719328c6de4a49aaa73c47cf3da69c6bb05027f1" and "e35bad9e1ec9deaa0dd252db97e1a26d4ac731f7" have entirely different histories.
719328c6de ... e35bad9e1e

3 changed files with 47 additions and 49 deletions
Show Stats Expand all files Collapse all files

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[project] [project]
name = "nvda_voicemeeter" name = "nvda_voicemeeter"
version = "0.2.1a3" version = "0.2.1a1"
description = "A Voicemeeter app compatible with NVDA" description = "A Voicemeeter app compatible with NVDA"
authors = [ authors = [
{ name = "onyx-and-iris", email = "code@onyxandiris.online" }, { name = "onyx-and-iris", email = "code@onyxandiris.online" },

9
src/nvda_voicemeeter/util.py
View File

@ -128,12 +128,3 @@ def get_bus_modes(vm) -> list:
"lfeonly", "lfeonly",
"rearonly", "rearonly",
] ]
def check_bounds(val, bounds):
lower, upper = bounds
if val > upper:
val = upper
elif val < lower:
val = lower
return val

85
src/nvda_voicemeeter/window.py
View File

@ -17,7 +17,6 @@ from .nvda import Nvda
from .parser import Parser from .parser import Parser
from .util import ( from .util import (
_patch_insert_channels, _patch_insert_channels,
check_bounds,
get_asio_checkbox_index, get_asio_checkbox_index,
get_asio_samples_list, get_asio_samples_list,
get_bus_modes, get_bus_modes,
@ -692,39 +691,43 @@ class NVDAVMWindow(psg.Window):
case [["STRIP", index], ["SLIDER", "GAIN"], ["FOCUS", "OUT"]]: case [["STRIP", index], ["SLIDER", "GAIN"], ["FOCUS", "OUT"]]:
self.vm.event.pdirty = True self.vm.event.pdirty = True
case [["STRIP", index], ["SLIDER", "GAIN"], ["KEY", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction]]: case [["STRIP", index], ["SLIDER", "GAIN"], ["KEY", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction]]:
val = self.vm.strip[int(index)].gain val = values[f"STRIP {index}||SLIDER GAIN"]
match direction: match direction:
case "RIGHT" | "UP": case "LEFT":
val += 1 val -= 0.9
case "LEFT" | "DOWN": case "DOWN":
val -= 1 val -= 1.1
self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12)) case "RIGHT":
val += 0.9
case "UP":
val += 1.1
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
case [ case [
["STRIP", index], ["STRIP", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
["KEY", "CTRL", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction], ["KEY", "CTRL", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction],
]: ]:
val = self.vm.strip[int(index)].gain val = values[f"STRIP {index}||SLIDER GAIN"]
match direction: match direction:
case "RIGHT" | "UP": case "LEFT":
val += 3 val += 4.2
case "LEFT" | "DOWN": case "DOWN":
val -= 3 val -= 10.2
self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12)) case "RIGHT":
val -= 4.2
case "UP":
val += 10.2
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
case [ case [
["STRIP", index], ["STRIP", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
["KEY", "SHIFT", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction], ["KEY", "SHIFT", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction],
]: ]:
val = self.vm.strip[int(index)].gain val = values[f"STRIP {index}||SLIDER GAIN"]
match direction: if direction == "UP":
case "RIGHT" | "UP": val += 0.2
val += 0.1 elif direction == "DOWN":
case "LEFT" | "DOWN": val -= 0.2
val -= 0.1
self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12))
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
# Bus Params # Bus Params
@ -801,39 +804,43 @@ class NVDAVMWindow(psg.Window):
case [["BUS", index], ["SLIDER", "GAIN"], ["FOCUS", "OUT"]]: case [["BUS", index], ["SLIDER", "GAIN"], ["FOCUS", "OUT"]]:
self.vm.event.pdirty = True self.vm.event.pdirty = True
case [["BUS", index], ["SLIDER", "GAIN"], ["KEY", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction]]: case [["BUS", index], ["SLIDER", "GAIN"], ["KEY", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction]]:
val = self.vm.bus[int(index)].gain val = values[f"BUS {index}||SLIDER GAIN"]
match direction: match direction:
case "RIGHT" | "UP": case "LEFT":
val += 1 val -= 0.9
case "LEFT" | "DOWN": case "DOWN":
val -= 1 val -= 1.1
self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12)) case "RIGHT":
val += 0.9
case "UP":
val += 1.1
self[f"BUS {index}||SLIDER GAIN"].update(value=val) self[f"BUS {index}||SLIDER GAIN"].update(value=val)
case [ case [
["BUS", index], ["BUS", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
["KEY", "CTRL", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction], ["KEY", "CTRL", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction],
]: ]:
val = self.vm.bus[int(index)].gain val = values[f"BUS {index}||SLIDER GAIN"]
match direction: match direction:
case "RIGHT" | "UP": case "LEFT":
val += 3 val += 4.2
case "LEFT" | "DOWN": case "DOWN":
val -= 3 val -= 10.2
self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12)) case "RIGHT":
val -= 4.2
case "UP":
val += 10.2
self[f"BUS {index}||SLIDER GAIN"].update(value=val) self[f"BUS {index}||SLIDER GAIN"].update(value=val)
case [ case [
["BUS", index], ["BUS", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
["KEY", "SHIFT", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction], ["KEY", "SHIFT", "LEFT" | "RIGHT" | "UP" | "DOWN" as direction],
]: ]:
val = self.vm.bus[int(index)].gain val = values[f"BUS {index}||SLIDER GAIN"]
match direction: if direction == "UP":
case "RIGHT" | "UP": val += 0.2
val += 0.1 elif direction == "DOWN":
case "LEFT" | "DOWN": val -= 0.2
val -= 0.1
self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12))
self[f"BUS {index}||SLIDER GAIN"].update(value=val) self[f"BUS {index}||SLIDER GAIN"].update(value=val)
# Unknown # Unknown