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

Merge branch 'model' into UI_2.0

Browse Source
This commit is contained in:
misyaguziya
2023-09-30 23:00:19 +09:00
parent 49ac0a62d4 6c04d496c9
commit ecabd835c2
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
model.py
View File

@@ -253,6 +253,9 @@ class Model:
return False return False
def startMicTranscript(self, fnc): def startMicTranscript(self, fnc):
if config.CHOICE_MIC_HOST == "None" or config.CHOICE_MIC_DEVICE == "None":
return
mic_audio_queue = Queue() mic_audio_queue = Queue()
device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0] device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0]
record_timeout = config.INPUT_MIC_RECORD_TIMEOUT record_timeout = config.INPUT_MIC_RECORD_TIMEOUT
@@ -294,6 +297,9 @@ class Model:
self.mic_audio_recorder = None self.mic_audio_recorder = None
def startCheckMicEnergy(self, fnc): def startCheckMicEnergy(self, fnc):
if config.CHOICE_MIC_HOST == "None" or config.CHOICE_MIC_DEVICE == "None":
return
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()
@@ -320,6 +326,8 @@ class Model:
self.mic_energy_recorder = None self.mic_energy_recorder = None
def startSpeakerTranscript(self, fnc): def startSpeakerTranscript(self, fnc):
if config.CHOICE_SPEAKER_DEVICE == "None":
return
spk_audio_queue = Queue() spk_audio_queue = Queue()
spk_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0] spk_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0]
@@ -362,6 +370,9 @@ class Model:
self.spk_audio_recorder = None self.spk_audio_recorder = None
def startCheckSpeakerEnergy(self, fnc): def startCheckSpeakerEnergy(self, fnc):
if config.CHOICE_SPEAKER_DEVICE == "None":
return
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()

6
models/transcription/transcription_utils.py
View File

@@ -12,6 +12,8 @@ def getInputDevices():
devices[host["name"]].append(device) devices[host["name"]].append(device)
else: else:
devices[host["name"]] = [device] devices[host["name"]] = [device]
if len(devices) == 0:
devices = {"None": [{"name": "None"}]}
return devices return devices
def getOutputDevices(): def getOutputDevices():
@@ -21,6 +23,8 @@ def getOutputDevices():
for device in p.get_loopback_device_info_generator(): for device in p.get_loopback_device_info_generator():
if device["hostApi"] == wasapi_info["index"] and device["isLoopbackDevice"] is True: if device["hostApi"] == wasapi_info["index"] and device["isLoopbackDevice"] is True:
devices.append(device) devices.append(device)
if len(devices) == 0:
devices = [{'name':"None"}]
return devices return devices
def getDefaultInputDevice(): def getDefaultInputDevice():
@@ -34,6 +38,7 @@ def getDefaultInputDevice():
device = p.get_device_info_by_host_api_device_index(host_index, device_index) device = p.get_device_info_by_host_api_device_index(host_index, device_index)
if device["index"] == defaultInputDevice: if device["index"] == defaultInputDevice:
return {"host": host, "device": device} return {"host": host, "device": device}
return {"host": {"name": "None"}, "device": {"name": "None"}}
def getDefaultOutputDevice(): def getDefaultOutputDevice():
with PyAudio() as p: with PyAudio() as p:
@@ -50,3 +55,4 @@ def getDefaultOutputDevice():
if default_speakers["name"] in loopback["name"]: if default_speakers["name"] in loopback["name"]:
default_device = loopback default_device = loopback
return default_device return default_device
return {"name":"None"}