From 9410dc8291704f1144ec5128e52e8b0f9a3ca0fa Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 21 Sep 2023 22:42:10 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=B5=B7=E3=81=93=E3=81=97=E3=81=AEstop=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=0Bif=20s?= =?UTF-8?q?elf.mic=5Fenergy=5Frecorder=20!=3D=20None:=E3=81=93=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=8C=E5=95=8F=E9=A1=8C=E3=81=A0=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E9=96=A2=E9=80=A3=E3=81=97=E3=81=A6?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/model.py b/model.py index 19dc293d..26a01bef 100644 --- a/model.py +++ b/model.py @@ -55,8 +55,12 @@ class Model: def init(self): self.logger = None + self.mic_print_transcript = None + self.mic_audio_recorder = None self.mic_energy_recorder = None self.mic_energy_plot_progressbar = None + self.spk_print_transcript = None + self.spk_audio_recorder = None self.speaker_energy_recorder = None self.speaker_energy_plot_progressbar = None self.translator = Translator() @@ -284,9 +288,10 @@ class Model: def stopMicTranscript(self): if isinstance(self.mic_print_transcript, threadFnc): self.mic_print_transcript.stop() - if self.mic_audio_recorder.stop != None: + self.mic_print_transcript = None + if isinstance(self.mic_audio_recorder, SelectedMicRecorder): self.mic_audio_recorder.stop() - self.mic_audio_recorder.stop = None + self.mic_audio_recorder = None def startCheckMicEnergy(self, fnc): def sendMicEnergy(): @@ -309,9 +314,10 @@ class Model: 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_plot_progressbar = None + if isinstance(self.mic_energy_recorder, SelectedMicEnergyRecorder): self.mic_energy_recorder.stop() - self.mic_energy_recorder.stop = None + self.mic_energy_recorder = None def startSpeakerTranscript(self, fnc): spk_audio_queue = Queue() @@ -350,9 +356,10 @@ class Model: def stopSpeakerTranscript(self): if isinstance(self.spk_print_transcript, threadFnc): self.spk_print_transcript.stop() - if self.spk_audio_recorder.stop != None: + self.spk_print_transcript = None + if isinstance(self.spk_audio_recorder, SelectedSpeakerRecorder): self.spk_audio_recorder.stop() - self.spk_audio_recorder.stop = None + self.spk_audio_recorder = None def startCheckSpeakerEnergy(self, fnc): def sendSpeakerEnergy(): @@ -375,9 +382,10 @@ class Model: 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_plot_progressbar = None + if isinstance(self.speaker_energy_recorder, SelectedSpeakeEnergyRecorder): self.speaker_energy_recorder.stop() - self.speaker_energy_recorder.stop != None + self.speaker_energy_recorder = None def notificationXSOverlay(self, message): xsoverlayForVRCT(content=f"{message}")