every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛[bugfix] Model : OSC mute同期機能を修正

Browse Source
This commit is contained in:
misyaguziya
2024-05-06 17:30:09 +09:00
parent b926fb856c
commit 7f6c9a53ac
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controller.py
View File

@@ -858,6 +858,7 @@ def callbackSetEnableAutoExportMessageLogs(value):
def callbackSetEnableVrcMicMuteSync(value): def callbackSetEnableVrcMicMuteSync(value):
print("callbackSetEnableVrcMicMuteSync", value) print("callbackSetEnableVrcMicMuteSync", value)
config.ENABLE_VRC_MIC_MUTE_SYNC = value config.ENABLE_VRC_MIC_MUTE_SYNC = value
model.changePutQueueMicAudio()
def callbackSetEnableSendMessageToVrc(value): def callbackSetEnableSendMessageToVrc(value):
print("callbackSetEnableSendMessageToVrc", value) print("callbackSetEnableSendMessageToVrc", value)

31
model.py
View File

@@ -223,25 +223,24 @@ class Model:
def oscSendMessage(message): def oscSendMessage(message):
sendMessage(message, config.OSC_IP_ADDRESS, config.OSC_PORT) sendMessage(message, config.OSC_IP_ADDRESS, config.OSC_PORT)
@staticmethod
def getMuteSelfStatus():
return getOSCParameterValue(address="/avatar/parameters/MuteSelf")
def startReceiveOSC(self): def startReceiveOSC(self):
osc_parameter_prefix = "/avatar/parameters/" osc_parameter_prefix = "/avatar/parameters/"
param_MuteSelf = "MuteSelf" param_MuteSelf = "MuteSelf"
self.mute_status = getOSCParameterValue(address=osc_parameter_prefix + param_MuteSelf) self.mute_status = self.getMuteSelfStatus()
def change_handler_mute(address, osc_arguments): def change_handler_mute(address, osc_arguments):
if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
if osc_arguments is True and self.mute_status is False: if osc_arguments is True and self.mute_status is False:
self.stopPutQueueMicAudio()
self.mute_status = True self.mute_status = True
elif osc_arguments is False and self.mute_status is True:
self.startPutQueueMicAudio()
self.mute_status = False
def change_handler_voice(address, osc_arguments):
if config.ENABLE_VRC_MIC_MUTE_SYNC is True: if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
if self.mute_status is True: self.stopPutQueueMicAudio()
self.startPutQueueMicAudio() elif osc_arguments is False and self.mute_status is True:
self.mute_status = False self.mute_status = False
if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
self.startPutQueueMicAudio()
dict_filter_and_target = { dict_filter_and_target = {
osc_parameter_prefix + param_MuteSelf: change_handler_mute, osc_parameter_prefix + param_MuteSelf: change_handler_mute,
@@ -328,8 +327,7 @@ class Model:
self.mic_audio_queue = ConditionalQueue() self.mic_audio_queue = ConditionalQueue()
# self.mic_energy_queue = ConditionalQueue() # self.mic_energy_queue = ConditionalQueue()
if config.ENABLE_MUTE_DETECT is True and self.mute_status is True: self.changePutQueueMicAudio()
model.stopPutQueueMicAudio()
mic_device = choice_mic_device[0] mic_device = choice_mic_device[0]
record_timeout = config.INPUT_MIC_RECORD_TIMEOUT record_timeout = config.INPUT_MIC_RECORD_TIMEOUT
@@ -402,6 +400,15 @@ class Model:
self.mic_audio_queue.get() self.mic_audio_queue.get()
# self.mic_energy_queue.set_flag(False) # self.mic_energy_queue.set_flag(False)
def changePutQueueMicAudio(self):
if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
if self.mute_status is True:
self.stopPutQueueMicAudio()
else:
self.startPutQueueMicAudio()
else:
self.startPutQueueMicAudio()
def stopMicTranscript(self): def stopMicTranscript(self):
if isinstance(self.mic_print_transcript, threadFnc): if isinstance(self.mic_print_transcript, threadFnc):
self.mic_print_transcript.stop() self.mic_print_transcript.stop()