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

👍️[Update] device変更時にenergyも同期して変更するようにしました

Browse Source
This commit is contained in:
misyaguziya
2024-09-13 18:15:49 +09:00
parent 8bc6160ce8
commit 6254a93b20
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src-python/model.py
View File

@@ -553,7 +553,10 @@ class Model:
# self.mic_get_energy.stop() # self.mic_get_energy.stop()
# self.mic_get_energy = None # self.mic_get_energy = None
def startCheckMicEnergy(self, fnc): def startCheckMicEnergy(self, fnc:Callable[[float], None]=None) -> None:
if isinstance(fnc, Callable):
self.check_mic_energy_fnc = fnc
if config.ENABLE_MIC_AUTOMATIC_SELECTION is True: if config.ENABLE_MIC_AUTOMATIC_SELECTION is True:
default_device = getDefaultInputDevice() default_device = getDefaultInputDevice()
mic_host_name = default_device["host"]["name"] mic_host_name = default_device["host"]["name"]
@@ -572,7 +575,7 @@ class Model:
if mic_energy_queue.empty() is False: if mic_energy_queue.empty() is False:
energy = mic_energy_queue.get() energy = mic_energy_queue.get()
try: try:
fnc(energy) self.check_mic_energy_fnc(energy)
except Exception: except Exception:
pass pass
sleep(0.01) sleep(0.01)
@@ -684,7 +687,10 @@ class Model:
# self.speaker_get_energy.stop() # self.speaker_get_energy.stop()
# self.speaker_get_energy = None # self.speaker_get_energy = None
def startCheckSpeakerEnergy(self, fnc): def startCheckSpeakerEnergy(self, fnc:Callable[[float], None]=None) -> None:
if isinstance(fnc, Callable):
self.check_speaker_energy_fnc = fnc
if config.ENABLE_SPEAKER_AUTOMATIC_SELECTION is True: if config.ENABLE_SPEAKER_AUTOMATIC_SELECTION is True:
default_device = getDefaultOutputDevice() default_device = getDefaultOutputDevice()
speaker_device_name = default_device["device"]["name"] speaker_device_name = default_device["device"]["name"]
@@ -701,7 +707,7 @@ class Model:
if speaker_energy_queue.empty() is False: if speaker_energy_queue.empty() is False:
energy = speaker_energy_queue.get() energy = speaker_energy_queue.get()
try: try:
fnc(energy) self.check_speaker_energy_fnc(energy)
except Exception: except Exception:
pass pass
sleep(0.01) sleep(0.01)

12
src-python/webui_controller.py
View File

@@ -793,7 +793,9 @@ def callbackSetMicHost(data, *args, **kwargs) -> dict:
printLog("Set Mic Host", data) printLog("Set Mic Host", data)
config.CHOICE_MIC_HOST = data config.CHOICE_MIC_HOST = data
config.CHOICE_MIC_DEVICE = model.getInputDefaultDevice() config.CHOICE_MIC_DEVICE = model.getInputDefaultDevice()
model.stopCheckMicEnergy() if config.ENABLE_CHECK_ENERGY_SEND is True:
model.stopCheckMicEnergy()
model.startCheckMicEnergy()
return {"status":200, return {"status":200,
"result":{ "result":{
"host":config.CHOICE_MIC_HOST, "host":config.CHOICE_MIC_HOST,
@@ -804,7 +806,9 @@ def callbackSetMicHost(data, *args, **kwargs) -> dict:
def callbackSetMicDevice(data, *args, **kwargs) -> dict: def callbackSetMicDevice(data, *args, **kwargs) -> dict:
printLog("Set Mic Device", data) printLog("Set Mic Device", data)
config.CHOICE_MIC_DEVICE = data config.CHOICE_MIC_DEVICE = data
model.stopCheckMicEnergy() if config.ENABLE_CHECK_ENERGY_SEND is True:
model.stopCheckMicEnergy()
model.startCheckMicEnergy()
return {"status":200, "result":config.CHOICE_MIC_DEVICE} return {"status":200, "result":config.CHOICE_MIC_DEVICE}
def callbackSetMicEnergyThreshold(data, *args, **kwargs) -> dict: def callbackSetMicEnergyThreshold(data, *args, **kwargs) -> dict:
@@ -940,7 +944,9 @@ def callbackDisableSpeakerAutomaticSelection(*args, **kwargs) -> dict:
def callbackSetSpeakerDevice(data, *args, **kwargs) -> dict: def callbackSetSpeakerDevice(data, *args, **kwargs) -> dict:
printLog("Set Speaker Device", data) printLog("Set Speaker Device", data)
config.CHOICE_SPEAKER_DEVICE = data config.CHOICE_SPEAKER_DEVICE = data
model.stopCheckSpeakerEnergy() if config.ENABLE_CHECK_ENERGY_RECEIVE is True:
model.stopCheckSpeakerEnergy()
model.startCheckSpeakerEnergy()
return {"status":200, "result":config.CHOICE_SPEAKER_DEVICE} return {"status":200, "result":config.CHOICE_SPEAKER_DEVICE}
def callbackSetSpeakerEnergyThreshold(data, *args, **kwargs) -> dict: def callbackSetSpeakerEnergyThreshold(data, *args, **kwargs) -> dict: