From abab56028165a7ed4090cdb21b7d33fb68425261 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Tue, 26 Sep 2023 17:20:15 +0100 Subject: [PATCH] +10, +50 step binds added for gate bump to version 0.5.0a2 Initial gate slider implementation for Issue #14 --- pyproject.toml | 2 +- src/nvda_voicemeeter/compound.py | 7 ++- src/nvda_voicemeeter/popup.py | 78 ++++++++++++++++++++++++++++++-- 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dbcb0ac..d9182b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nvda_voicemeeter" -version = "0.5.0a1" +version = "0.5.0a2" description = "A Voicemeeter app compatible with NVDA" authors = [ { name = "onyx-and-iris", email = "code@onyxandiris.online" }, diff --git a/src/nvda_voicemeeter/compound.py b/src/nvda_voicemeeter/compound.py index 0dc08c7..9662d87 100644 --- a/src/nvda_voicemeeter/compound.py +++ b/src/nvda_voicemeeter/compound.py @@ -191,9 +191,14 @@ class LabelSliderAdvanced(psg.Frame): """Compound Label Slider element for Advanced Comp|Gate""" def __init__(self, parent, index, param, slider_cls: Union[CompSlider, GateSlider], *args, **kwargs): + label_map = { + "DAMPING": "Damping Max", + "BPSIDECHAIN": "BP Sidechain", + } + layout = [ [ - psg.Text(param.capitalize(), size=8), + psg.Text(label_map.get(param, param.title()), size=10), slider_cls(parent.vm, index, param), ] ] diff --git a/src/nvda_voicemeeter/popup.py b/src/nvda_voicemeeter/popup.py index 86089d2..7010b3f 100644 --- a/src/nvda_voicemeeter/popup.py +++ b/src/nvda_voicemeeter/popup.py @@ -489,6 +489,13 @@ class Popup: popup[f"GATE||SLIDER {param}"].bind( f"", f"||KEY CTRL {direction.upper()} {event_id}" ) + if param in ("BPSIDECHAIN", "ATTACK", "HOLD", "RELEASE"): + popup[f"GATE||SLIDER {param}"].bind( + f"", f"||KEY ALT {direction.upper()} {event_id}" + ) + popup[f"GATE||SLIDER {param}"].bind( + f"", f"||KEY CTRL ALT {direction.upper()} {event_id}" + ) popup["Exit"].bind("", "||FOCUS IN") popup["Exit"].bind("", "||KEY ENTER") while True: @@ -501,7 +508,11 @@ class Popup: case [["GATE"], ["SLIDER", param]]: setattr(self.window.vm.strip[index].gate, param.lower(), values[event]) case [["GATE"], ["SLIDER", param], ["FOCUS", "IN"]]: - self.window.nvda.speak(f"{param} {values[f'GATE||SLIDER {param}']}") + label_map = { + "DAMPING": "Damping Max", + "BPSIDECHAIN": "BP Sidechain", + } + self.window.nvda.speak(f"{label_map.get(param, param)} {values[f'GATE||SLIDER {param}']}") case [ ["GATE"], @@ -522,7 +533,10 @@ class Popup: setattr(self.window.vm.strip[index].gate, param.lower(), val) popup[f"GATE||SLIDER {param}"].update(value=val) - self.window.nvda.speak(str(round(val, 1))) + if param == "BPSIDECHAIN": + self.window.nvda.speak(str(int(val))) + else: + self.window.nvda.speak(str(round(val, 1))) else: self.window.vm.event.pdirty = True case [ @@ -544,7 +558,10 @@ class Popup: setattr(self.window.vm.strip[index].gate, param.lower(), val) popup[f"GATE||SLIDER {param}"].update(value=val) - self.window.nvda.speak(str(round(val, 1))) + if param == "BPSIDECHAIN": + self.window.nvda.speak(str(int(val))) + else: + self.window.nvda.speak(str(round(val, 1))) else: self.window.vm.event.pdirty = True case [ @@ -566,10 +583,63 @@ class Popup: setattr(self.window.vm.strip[index].gate, param.lower(), val) popup[f"GATE||SLIDER {param}"].update(value=val) - self.window.nvda.speak(str(round(val, 1))) + if param == "BPSIDECHAIN": + self.window.nvda.speak(str(int(val))) + else: + self.window.nvda.speak(str(round(val, 1))) + else: + self.window.vm.event.pdirty = True + case [ + ["GATE"], + ["SLIDER", "BPSIDECHAIN" | "ATTACK" | "HOLD" | "RELEASE" as param], + ["KEY", "ALT", "LEFT" | "RIGHT" as input_direction, "PRESS" | "RELEASE" as e], + ]: + if e == "PRESS": + self.window.vm.event.pdirty = False + val = getattr(self.window.vm.strip[index].gate, param.lower()) + + match input_direction: + case "RIGHT" | "UP": + val += 10 + case "LEFT" | "DOWN": + val -= 10 + + val = GateSlider.check_bounds(param, val) + setattr(self.window.vm.strip[index].gate, param.lower(), val) + popup[f"GATE||SLIDER {param}"].update(value=val) + if param == "BPSIDECHAIN": + self.window.nvda.speak(str(int(val))) + else: + self.window.nvda.speak(str(round(val, 1))) + else: + self.window.vm.event.pdirty = True + case [ + ["GATE"], + ["SLIDER", "BPSIDECHAIN" | "ATTACK" | "HOLD" | "RELEASE" as param], + ["KEY", "CTRL", "ALT", "LEFT" | "RIGHT" as input_direction, "PRESS" | "RELEASE" as e], + ]: + if e == "PRESS": + self.window.vm.event.pdirty = False + val = getattr(self.window.vm.strip[index].gate, param.lower()) + + match input_direction: + case "RIGHT" | "UP": + val += 50 + case "LEFT" | "DOWN": + val -= 50 + + val = GateSlider.check_bounds(param, val) + setattr(self.window.vm.strip[index].gate, param.lower(), val) + popup[f"GATE||SLIDER {param}"].update(value=val) + if param == "BPSIDECHAIN": + self.window.nvda.speak(str(int(val))) + else: + self.window.nvda.speak(str(round(val, 1))) else: self.window.vm.event.pdirty = True + case [[button], ["FOCUS", "IN"]]: + self.window.nvda.speak(button) case [_, ["KEY", "ENTER"]]: popup.find_element_with_focus().click()