onyx_online/nvda-addon-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-addon-voicemeeter.git synced 2026-03-21 04:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix valid_index for karaoke for banana kind

Browse Source 
work with 0-based indexing throughout the methods and only convert to 1-based indexing for announcements.
This commit is contained in:
onyx-and-iris 2026-03-19 06:17:46 +00:00
parent 0bd28be7b8
commit 6b57cfba57
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addon/globalPlugins/voicemeeter/commands.py
View File

@ -91,17 +91,18 @@ class CommandsMixin:
ui.message('MC only available for strips') ui.message('MC only available for strips')
return return
valid_indices = [self.kind.phys_in + 1] valid_indices_zero_based = [self.kind.phys_in]
match self.kind.name: match self.kind.name:
case 'potato': case 'potato':
valid_indices.append(self.kind.phys_in + self.kind.virt_in) valid_indices_zero_based.append(self.kind.phys_in + self.kind.virt_in - 1)
if self.controller.ctx.index + 1 not in valid_indices: if self.controller.ctx.index not in valid_indices_zero_based:
if len(valid_indices) == 1: valid_indices_display = [i + 1 for i in valid_indices_zero_based]
ui.message(f'MC only available for strip {valid_indices[0]} for Voicemeeter {self.kind}') if len(valid_indices_display) == 1:
ui.message(f'MC only available for strip {valid_indices_display[0]} for Voicemeeter {self.kind}')
else: else:
ui.message( ui.message(
f'MC only available for strips {valid_indices[0]} and {valid_indices[1]} for Voicemeeter {self.kind}' f'MC only available for strips {valid_indices_display[0]} and {valid_indices_display[1]} for Voicemeeter {self.kind}'
) )
return return
@ -114,10 +115,21 @@ class CommandsMixin:
ui.message('Karaoke mode only available for strips') ui.message('Karaoke mode only available for strips')
return return
valid_index = self.kind.phys_in + self.kind.virt_in - 1 if self.kind.name not in ['banana', 'potato']:
# controller index is 0 based and the gesture display is 1 based, so subtract 1 from valid_index ui.message(f'Karaoke mode not available for Voicemeeter {self.kind}')
if self.controller.ctx.index != valid_index - 1: return
ui.message(f'Karaoke mode only available for strip {valid_index} for Voicemeeter {self.kind}')
valid_index_zero_based = None
match self.kind.name:
case 'banana':
valid_index_zero_based = self.kind.phys_in + self.kind.virt_in - 1
case 'potato':
valid_index_zero_based = self.kind.phys_in + self.kind.virt_in - 2
if self.controller.ctx.index != valid_index_zero_based:
ui.message(
f'Karaoke mode only available for strip {valid_index_zero_based + 1} for Voicemeeter {self.kind}'
)
return return
opts = ['off', 'k m', 'k 1', 'k 2', 'k v'] opts = ['off', 'k m', 'k 1', 'k 2', 'k v']