mirror of
				https://github.com/onyx-and-iris/nvda-voicemeeter.git
				synced 2025-10-31 18:01:47 +00:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			e35bad9e1e
			...
			719328c6de
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 719328c6de | |||
| 65a148aa7b | |||
| ba1fb28187 | 
| @ -1,6 +1,6 @@ | |||||||
| [project] | [project] | ||||||
| name = "nvda_voicemeeter" | name = "nvda_voicemeeter" | ||||||
| version = "0.2.1a1" | version = "0.2.1a3" | ||||||
| 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" }, | ||||||
|  | |||||||
| @ -128,3 +128,12 @@ 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 | ||||||
|  | |||||||
| @ -17,6 +17,7 @@ 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, | ||||||
| @ -691,43 +692,39 @@ 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 = values[f"STRIP {index}||SLIDER GAIN"] |                     val = self.vm.strip[int(index)].gain | ||||||
|                     match direction: |                     match direction: | ||||||
|                         case "LEFT": |                         case "RIGHT" | "UP": | ||||||
|                             val -= 0.9 |                             val += 1 | ||||||
|                         case "DOWN": |                         case "LEFT" | "DOWN": | ||||||
|                             val -= 1.1 |                             val -= 1 | ||||||
|                         case "RIGHT": |                     self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12)) | ||||||
|                             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 = values[f"STRIP {index}||SLIDER GAIN"] |                     val = self.vm.strip[int(index)].gain | ||||||
|                     match direction: |                     match direction: | ||||||
|                         case "LEFT": |                         case "RIGHT" | "UP": | ||||||
|                             val += 4.2 |                             val += 3 | ||||||
|                         case "DOWN": |                         case "LEFT" | "DOWN": | ||||||
|                             val -= 10.2 |                             val -= 3 | ||||||
|                         case "RIGHT": |                     self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12)) | ||||||
|                             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 = values[f"STRIP {index}||SLIDER GAIN"] |                     val = self.vm.strip[int(index)].gain | ||||||
|                     if direction == "UP": |                     match direction: | ||||||
|                         val += 0.2 |                         case "RIGHT" | "UP": | ||||||
|                     elif direction == "DOWN": |                             val += 0.1 | ||||||
|                         val -= 0.2 |                         case "LEFT" | "DOWN": | ||||||
|  |                             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 | ||||||
| @ -804,43 +801,39 @@ 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 = values[f"BUS {index}||SLIDER GAIN"] |                     val = self.vm.bus[int(index)].gain | ||||||
|                     match direction: |                     match direction: | ||||||
|                         case "LEFT": |                         case "RIGHT" | "UP": | ||||||
|                             val -= 0.9 |                             val += 1 | ||||||
|                         case "DOWN": |                         case "LEFT" | "DOWN": | ||||||
|                             val -= 1.1 |                             val -= 1 | ||||||
|                         case "RIGHT": |                     self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12)) | ||||||
|                             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 = values[f"BUS {index}||SLIDER GAIN"] |                     val = self.vm.bus[int(index)].gain | ||||||
|                     match direction: |                     match direction: | ||||||
|                         case "LEFT": |                         case "RIGHT" | "UP": | ||||||
|                             val += 4.2 |                             val += 3 | ||||||
|                         case "DOWN": |                         case "LEFT" | "DOWN": | ||||||
|                             val -= 10.2 |                             val -= 3 | ||||||
|                         case "RIGHT": |                     self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12)) | ||||||
|                             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 = values[f"BUS {index}||SLIDER GAIN"] |                     val = self.vm.bus[int(index)].gain | ||||||
|                     if direction == "UP": |                     match direction: | ||||||
|                         val += 0.2 |                         case "RIGHT" | "UP": | ||||||
|                     elif direction == "DOWN": |                             val += 0.1 | ||||||
|                         val -= 0.2 |                         case "LEFT" | "DOWN": | ||||||
|  |                             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 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user