Compare commits

..

No commits in common. "5992e25c7971385fb9771b1c05d27588d4c6305c" and "26e68900aa057175532b81ebe09bffa33499a794" have entirely different histories.

3 changed files with 8 additions and 34 deletions

View File

@ -146,7 +146,7 @@ gain = 0.0
mode = "normal" mode = "normal"
[bus-1] [bus-1]
label = "System" label = "ASIO [1,2]"
mono = false mono = false
eq.on = false eq.on = false
mute = false mute = false
@ -154,7 +154,7 @@ gain = 0.0
mode = "normal" mode = "normal"
[bus-2] [bus-2]
label = "Comms" label = "ASIO [3,4]"
mono = false mono = false
eq.on = false eq.on = false
mute = false mute = false
@ -162,7 +162,7 @@ gain = 0.0
mode = "normal" mode = "normal"
[bus-3] [bus-3]
label = "Pretzel" label = "ASIO [5,6]"
mono = false mono = false
eq.on = false eq.on = false
mute = false mute = false
@ -170,7 +170,7 @@ gain = 0.0
mode = "normal" mode = "normal"
[bus-4] [bus-4]
label = "GAME PCs" label = "ASIO [7,8]"
mono = false mono = false
eq.on = false eq.on = false
mute = false mute = false

View File

@ -70,26 +70,6 @@ class Audio(ILayer):
self.logger.info('Only Stream Enabled') self.logger.info('Only Stream Enabled')
else: else:
self.logger.info('Only Stream Disabled') self.logger.info('Only Stream Disabled')
case 'sound_test':
if current_value:
self.logger.info('Sound Test Enabled')
else:
self.logger.info('Sound Test Disabled')
case 'patch_onyx':
if current_value:
self.logger.info('Onyx mic has been patched')
else:
self.logger.info('Onyx mic has been unpatched')
case 'patch_iris':
if current_value:
self.logger.info('Iris mic has been patched')
else:
self.logger.info('Iris mic has been unpatched')
case 'mute_game_pcs':
if current_value:
self.logger.info('Game PCs Muted')
else:
self.logger.info('Game PCs Unmuted')
setattr(self.state, button.name, current_value) setattr(self.state, button.name, current_value)
@ -182,7 +162,6 @@ class Audio(ILayer):
self.vm.strip[VMStrips.onyx_mic].apply({'A1': False, 'B1': True, 'B3': True, 'mute': True}) self.vm.strip[VMStrips.onyx_mic].apply({'A1': False, 'B1': True, 'B3': True, 'mute': True})
self.vm.strip[VMStrips.iris_mic].apply({'A1': False, 'B2': True, 'B3': True, 'mute': True}) self.vm.strip[VMStrips.iris_mic].apply({'A1': False, 'B2': True, 'B3': True, 'mute': True})
self.logger.info('Sound Test Disabled') self.logger.info('Sound Test Disabled')
self.vm.button[Buttons.sound_test].stateonly = self.state.sound_test
@ensure_mixer_fadeout @ensure_mixer_fadeout
def stage_onyx_mic(self): def stage_onyx_mic(self):
@ -226,7 +205,6 @@ class Audio(ILayer):
else: else:
self.vm.patch.asio[0].set(0) self.vm.patch.asio[0].set(0)
self.logger.info('Onyx mic has been unpatched') self.logger.info('Onyx mic has been unpatched')
self.vm.button[Buttons.patch_onyx].stateonly = self.state.patch_onyx
def patch_iris(self): def patch_iris(self):
self.state.patch_iris = not self.state.patch_iris self.state.patch_iris = not self.state.patch_iris
@ -236,17 +214,15 @@ class Audio(ILayer):
else: else:
self.vm.patch.asio[2].set(0) self.vm.patch.asio[2].set(0)
self.logger.info('Iris mic has been unpatched') self.logger.info('Iris mic has been unpatched')
self.vm.button[Buttons.patch_iris].stateonly = self.state.patch_iris
def mute_game_pcs(self): def mute_game_pcs(self):
self.state.mute_game_pcs = not self.state.mute_game_pcs self.state.mute_game_pcs = not self.state.mute_game_pcs
if self.state.mute_game_pcs: if self.state.mute_game_pcs:
self.vm.bus[VMBuses.game_pcs].mute = True self.mixer.strip[XAirStrips.game_pcs].send[XAirBuses.stream_mix].level = -90
self.logger.info('Game PCs Muted') self.logger.info('Game PCs Muted')
else: else:
self.vm.bus[VMBuses.game_pcs].mute = False self.mixer.strip[XAirStrips.game_pcs].send[XAirBuses.stream_mix].level = -24
self.logger.info('Game PCs Unmuted') self.logger.info('Game PCs Unmuted')
self.vm.button[Buttons.mute_game_pcs].stateonly = self.state.mute_game_pcs
### Workstation and TV Audio Routing via VBAN ### ### Workstation and TV Audio Routing via VBAN ###

View File

@ -1,12 +1,10 @@
from enum import IntEnum from enum import IntEnum
Buttons = IntEnum( Buttons = IntEnum('Buttons', 'mute_mics only_discord only_stream', start=0)
'Buttons', 'mute_mics only_discord only_stream sound_test patch_onyx patch_iris mute_game_pcs', start=0
)
# Voicemeeter Channels # Voicemeeter Channels
VMStrips = IntEnum('Strips', 'onyx_mic iris_mic onyx_pc iris_pc st_input_5 system comms pretzel', start=0) VMStrips = IntEnum('Strips', 'onyx_mic iris_mic onyx_pc iris_pc st_input_5 system comms pretzel', start=0)
VMBuses = IntEnum('Buses', 'system comms pretzel game_pcs onyx_mic iris_mic both_mics', start=1) VMBuses = IntEnum('Buses', 'onyx_mic iris_mic both_mics', start=5)
# VBAN Channels # VBAN Channels
VBANChannels = IntEnum('VBANChannels', 'onyx_mic iris_mic comms workstation', start=0) VBANChannels = IntEnum('VBANChannels', 'onyx_mic iris_mic comms workstation', start=0)