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-10-12 15:01:00 +09:00
parent 243492ac91 07ffb89a5d
commit f82d5bfd54
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller.py
View File

@@ -418,7 +418,7 @@ def callbackCheckMicThreshold(is_turned_on):
print("callbackCheckMicThreshold", is_turned_on) print("callbackCheckMicThreshold", is_turned_on)
if is_turned_on is True: if is_turned_on is True:
view.setWidgetsStatus_ThresholdCheckButton_Disabled() view.setWidgetsStatus_ThresholdCheckButton_Disabled()
model.startCheckMicEnergy(setProgressBarMicEnergy) model.startCheckMicEnergy(setProgressBarMicEnergy, view.initProgressBar_MicEnergy)
view.replaceMicThresholdCheckButton_Active() view.replaceMicThresholdCheckButton_Active()
view.setWidgetsStatus_ThresholdCheckButton_Normal() view.setWidgetsStatus_ThresholdCheckButton_Normal()
else: else:
@@ -511,7 +511,7 @@ def callbackCheckSpeakerThreshold(is_turned_on):
print("callbackCheckSpeakerThreshold", is_turned_on) print("callbackCheckSpeakerThreshold", is_turned_on)
if is_turned_on is True: if is_turned_on is True:
view.setWidgetsStatus_ThresholdCheckButton_Disabled() view.setWidgetsStatus_ThresholdCheckButton_Disabled()
model.startCheckSpeakerEnergy(setProgressBarSpeakerEnergy) model.startCheckSpeakerEnergy(setProgressBarSpeakerEnergy, view.initProgressBar_SpeakerEnergy)
view.replaceSpeakerThresholdCheckButton_Active() view.replaceSpeakerThresholdCheckButton_Active()
view.setWidgetsStatus_ThresholdCheckButton_Normal() view.setWidgetsStatus_ThresholdCheckButton_Normal()
else: else:

13
model.py
View File

@@ -24,9 +24,10 @@ from models.transcription.transcription_languages import transcription_lang
from config import config from config import config
class threadFnc(Thread): class threadFnc(Thread):
def __init__(self, fnc, daemon=True, *args, **kwargs): def __init__(self, fnc, end_fnc=None, daemon=True, *args, **kwargs):
super(threadFnc, self).__init__(daemon=daemon, *args, **kwargs) super(threadFnc, self).__init__(daemon=daemon, *args, **kwargs)
self.fnc = fnc self.fnc = fnc
self.end_fnc = end_fnc
self._stop = Event() self._stop = Event()
def stop(self): def stop(self):
self._stop.set() self._stop.set()
@@ -35,6 +36,8 @@ class threadFnc(Thread):
def run(self): def run(self):
while True: while True:
if self.stopped(): if self.stopped():
if callable(self.end_fnc):
self.end_fnc()
return return
self.fnc(*self._args, **self._kwargs) self.fnc(*self._args, **self._kwargs)
@@ -331,7 +334,7 @@ class Model:
self.mic_audio_recorder.stop() self.mic_audio_recorder.stop()
self.mic_audio_recorder = None self.mic_audio_recorder = None
def startCheckMicEnergy(self, fnc): def startCheckMicEnergy(self, fnc, end_fnc):
if config.CHOICE_MIC_HOST == "NoHost" or config.CHOICE_MIC_DEVICE == "NoDevice": if config.CHOICE_MIC_HOST == "NoHost" or config.CHOICE_MIC_DEVICE == "NoDevice":
return return
@@ -348,7 +351,7 @@ class Model:
mic_device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0] mic_device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0]
self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device)
self.mic_energy_recorder.recordIntoQueue(mic_energy_queue) self.mic_energy_recorder.recordIntoQueue(mic_energy_queue)
self.mic_energy_plot_progressbar = threadFnc(sendMicEnergy) self.mic_energy_plot_progressbar = threadFnc(sendMicEnergy, end_fnc=end_fnc)
self.mic_energy_plot_progressbar.daemon = True self.mic_energy_plot_progressbar.daemon = True
self.mic_energy_plot_progressbar.start() self.mic_energy_plot_progressbar.start()
@@ -404,7 +407,7 @@ class Model:
self.spk_audio_recorder.stop() self.spk_audio_recorder.stop()
self.spk_audio_recorder = None self.spk_audio_recorder = None
def startCheckSpeakerEnergy(self, fnc): def startCheckSpeakerEnergy(self, fnc, end_fnc):
if config.CHOICE_SPEAKER_DEVICE == "NoDevice": if config.CHOICE_SPEAKER_DEVICE == "NoDevice":
return return
@@ -421,7 +424,7 @@ class Model:
speaker_energy_queue = Queue() speaker_energy_queue = Queue()
self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device)
self.speaker_energy_recorder.recordIntoQueue(speaker_energy_queue) self.speaker_energy_recorder.recordIntoQueue(speaker_energy_queue)
self.speaker_energy_plot_progressbar = threadFnc(sendSpeakerEnergy) self.speaker_energy_plot_progressbar = threadFnc(sendSpeakerEnergy, end_fnc=end_fnc)
self.speaker_energy_plot_progressbar.daemon = True self.speaker_energy_plot_progressbar.daemon = True
self.speaker_energy_plot_progressbar.start() self.speaker_energy_plot_progressbar.start()