diff --git a/main.py b/main.py index ddcf1468..8175af67 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,4 @@ +from time import sleep from threading import Thread from config import config from model import model @@ -242,18 +243,19 @@ def callbackOpenConfigWindow(): view.foregroundOff() def callbackCloseConfigWindow(): - if config.ENABLE_TRANSCRIPTION_SEND is True: - startThreadingTranscriptionSendMessage() - if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - startThreadingTranscriptionReceiveMessage() model.stopCheckMicEnergy() + model.stopCheckSpeakerEnergy() view.replaceMicThresholdCheckButton_Passive() # view.initProgressBar_MicEnergy() # ProgressBarに0をセットしたい - - model.stopCheckSpeakerEnergy() view.replaceSpeakerThresholdCheckButton_Passive() # view.initProgressBar_SpeakerEnergy() # ProgressBarに0をセットしたい + if config.ENABLE_TRANSCRIPTION_SEND is True: + startThreadingTranscriptionSendMessage() + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: + sleep(2) + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: + startThreadingTranscriptionReceiveMessage() if config.ENABLE_FOREGROUND is True: view.foregroundOn() diff --git a/model.py b/model.py index ceef0686..b6964143 100644 --- a/model.py +++ b/model.py @@ -281,10 +281,11 @@ class Model: self.mic_energy_plot_progressbar.start() def stopCheckMicEnergy(self): + if isinstance(self.mic_energy_plot_progressbar, threadFnc): + self.mic_energy_plot_progressbar.stop() if self.mic_energy_recorder != None: self.mic_energy_recorder.stop() - if self.mic_energy_plot_progressbar != None: - self.mic_energy_plot_progressbar.stop() + self.mic_energy_recorder.stop = None def startSpeakerTranscript(self, fnc): spk_audio_queue = Queue() @@ -346,10 +347,11 @@ class Model: self.speaker_energy_plot_progressbar.start() def stopCheckSpeakerEnergy(self): + if isinstance(self.speaker_energy_plot_progressbar, threadFnc): + self.speaker_energy_plot_progressbar.stop() if self.speaker_energy_recorder != None: self.speaker_energy_recorder.stop() - if self.speaker_energy_plot_progressbar != None: - self.speaker_energy_plot_progressbar.stop() + self.speaker_energy_recorder.stop != None def notificationXSOverlay(self, message): xsoverlayForVRCT(content=f"{message}")