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

Merge branch 'bugfix_no_device' into develop

Browse Source
This commit is contained in:
Sakamoto Shiina
2025-03-22 18:10:42 +09:00
parent dcc0a27215 377899d5e1
commit cb2d0d5455
3 changed files with 182 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-python/controller.py
View File

@@ -150,7 +150,7 @@ class Controller:
400, 400,
self.run_mapping["error_device"], self.run_mapping["error_device"],
{ {
"message":"No Speaker device detected", "message":"No speaker device detected",
"data": None "data": None
}, },
) )

31
src-python/model.py
View File

@@ -396,9 +396,9 @@ class Model:
mic_device_list = device_manager.getMicDevices().get(mic_host_name, [{"name": "NoDevice"}]) mic_device_list = device_manager.getMicDevices().get(mic_host_name, [{"name": "NoDevice"}])
selected_mic_device = [device for device in mic_device_list if device["name"] == mic_device_name] selected_mic_device = [device for device in mic_device_list if device["name"] == mic_device_name]
if len(selected_mic_device) == 0: if len(selected_mic_device) == 0 or mic_device_name == "NoDevice":
return False fnc({"text": False, "language": None})
else:
self.mic_audio_queue = Queue() self.mic_audio_queue = Queue()
# self.mic_energy_queue = Queue() # self.mic_energy_queue = Queue()
@@ -531,9 +531,9 @@ class Model:
mic_device_list = device_manager.getMicDevices().get(mic_host_name, [{"name": "NoDevice"}]) mic_device_list = device_manager.getMicDevices().get(mic_host_name, [{"name": "NoDevice"}])
selected_mic_device = [device for device in mic_device_list if device["name"] == mic_device_name] selected_mic_device = [device for device in mic_device_list if device["name"] == mic_device_name]
if len(selected_mic_device) == 0: if len(selected_mic_device) == 0 or mic_device_name == "NoDevice":
return False self.check_mic_energy_fnc(False)
else:
def sendMicEnergy(): def sendMicEnergy():
if mic_energy_queue.empty() is False: if mic_energy_queue.empty() is False:
energy = mic_energy_queue.get() energy = mic_energy_queue.get()
@@ -562,12 +562,14 @@ class Model:
self.mic_energy_recorder = None self.mic_energy_recorder = None
def startSpeakerTranscript(self, fnc): def startSpeakerTranscript(self, fnc):
speaker_device_name = config.SELECTED_SPEAKER_DEVICE
speaker_device_list = device_manager.getSpeakerDevices() speaker_device_list = device_manager.getSpeakerDevices()
selected_speaker_device = [device for device in speaker_device_list if device["name"] == config.SELECTED_SPEAKER_DEVICE] selected_speaker_device = [device for device in speaker_device_list if device["name"] == speaker_device_name]
if len(selected_speaker_device) == 0:
return False
if len(selected_speaker_device) == 0 or speaker_device_name == "NoDevice":
fnc({"text": False, "language": None})
else:
speaker_audio_queue = Queue() speaker_audio_queue = Queue()
# speaker_energy_queue = Queue() # speaker_energy_queue = Queue()
speaker_device = selected_speaker_device[0] speaker_device = selected_speaker_device[0]
@@ -656,12 +658,13 @@ class Model:
if isinstance(fnc, Callable): if isinstance(fnc, Callable):
self.check_speaker_energy_fnc = fnc self.check_speaker_energy_fnc = fnc
speaker_device_name = config.SELECTED_SPEAKER_DEVICE
speaker_device_list = device_manager.getSpeakerDevices() speaker_device_list = device_manager.getSpeakerDevices()
selected_speaker_device = [device for device in speaker_device_list if device["name"] == config.SELECTED_SPEAKER_DEVICE] selected_speaker_device = [device for device in speaker_device_list if device["name"] == speaker_device_name]
if len(selected_speaker_device) == 0:
return False
if len(selected_speaker_device) == 0 or speaker_device_name == "NoDevice":
self.check_speaker_energy_fnc(False)
else:
def sendSpeakerEnergy(): def sendSpeakerEnergy():
if speaker_energy_queue.empty() is False: if speaker_energy_queue.empty() is False:
energy = speaker_energy_queue.get() energy = speaker_energy_queue.get()

2
src-ui/logics/_useBackendErrorHandling.js
View File

@@ -40,7 +40,7 @@ export const _useBackendErrorHandling = () => {
case "No mic device detected": case "No mic device detected":
showNotification_Error(t("common_error.no_device_mic")); showNotification_Error(t("common_error.no_device_mic"));
break; break;
case "No Speaker device detected": case "No speaker device detected":
showNotification_Error(t("common_error.no_device_speaker")); showNotification_Error(t("common_error.no_device_speaker"));
break; break;