From bfed9a2d26277a463a3d847d6a6c73fbf5437c58 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Tue, 5 Sep 2023 22:38:26 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Config=20Window=E3=81=AE?= =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=82=AF/=E3=82=B9=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AEenergy=E6=A4=9C=E5=87=BA=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=A7=E3=82=B9=E3=83=94=E3=83=BC=E3=82=AB=E3=83=BC?= =?UTF-8?q?->=E3=83=9E=E3=82=A4=E3=82=AF=E3=81=AE=E9=A0=86=E3=81=A7ON?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AB=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0=E3=81=8C=E8=90=BD=E3=81=A1?= =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model.py | 14 ++++---------- models/transcription/transcription_recorder.py | 2 -- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/model.py b/model.py index 20524129..e6440941 100644 --- a/model.py +++ b/model.py @@ -250,6 +250,7 @@ class Model: energy = mic_energy_queue.get() fnc(energy) sleep(0.01) + mic_energy_queue = Queue() 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) @@ -303,24 +304,17 @@ class Model: fnc(energy) sleep(0.01) - def getSpeakerEnergy(): - with self.speaker_energy_recorder.source as source: - energy = self.speaker_energy_recorder.recorder.listen_energy(source) - speaker_energy_queue.put(energy) - speaker_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0] speaker_energy_queue = Queue() self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) - self.speaker_energy_get_progressbar = threadFnc(getSpeakerEnergy) - self.speaker_energy_get_progressbar.daemon = True - self.speaker_energy_get_progressbar.start() + self.speaker_energy_recorder.recordIntoQueue(speaker_energy_queue) self.speaker_energy_plot_progressbar = threadFnc(sendSpeakerEnergy) self.speaker_energy_plot_progressbar.daemon = True self.speaker_energy_plot_progressbar.start() def stopCheckSpeakerEnergy(self): - if self.speaker_energy_get_progressbar != None: - self.speaker_energy_get_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() diff --git a/models/transcription/transcription_recorder.py b/models/transcription/transcription_recorder.py index cf2cec04..4e46cfc7 100644 --- a/models/transcription/transcription_recorder.py +++ b/models/transcription/transcription_recorder.py @@ -84,8 +84,6 @@ class SelectedSpeakeEnergyRecorder(BaseEnergyRecorder): source = Microphone(speaker=True, device_index= device["index"], sample_rate=int(device["defaultSampleRate"]), - chunk_size=get_sample_size(paInt16), - channels=device["maxInputChannels"] ) super().__init__(source=source) # self.adjustForNoise() \ No newline at end of file