Compare commits

..

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

3 changed files with 47 additions and 49 deletions

View File

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

View File

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

View File

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