From b31cfc0487cf5c06e645926d1845867ecb7ea196 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sun, 17 Sep 2023 07:38:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20model=20stopCheckMic?= =?UTF-8?q?Energy/stopCheckSpeakerEnergy=E3=81=AE=E7=B5=82=E4=BA=86?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92stopMicTranscript/stopSpeakerTranscr?= =?UTF-8?q?ipt=E3=81=AE=E5=87=A6=E7=90=86=E3=81=A8=E5=90=8C=E3=81=98?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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}") From e84764dcd904530772acc161191fd3e6fcb78946 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sun, 17 Sep 2023 07:40:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20main=20config.ENABLE?= =?UTF-8?q?=5FTRANSCRIPTION=5FSEND=20is=20True=20=E3=81=8B=E3=81=A4=20conf?= =?UTF-8?q?ig.ENABLE=5FTRANSCRIPTION=5FRECEIVE=20is=20True=E3=81=AE?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9?= =?UTF-8?q?=E3=83=89=E3=83=A9=E3=82=A4=E3=83=90=E3=81=AE=E3=82=A2=E3=82=AF?= =?UTF-8?q?=E3=82=BB=E3=82=B9=E5=B9=B2=E6=B8=89=E3=81=8C=E8=B5=B7=E3=81=8D?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=ABNOP=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 1a5eca28..696b8c64 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()