From 3c6d51f8354b931412c92f9ae665ceb37518111a Mon Sep 17 00:00:00 2001 From: misygauziya Date: Fri, 7 Jul 2023 18:05:22 +0900 Subject: [PATCH 1/8] [update] Config Transcription Tab change energy threshold UI. Entry to Slider --- window_config.py | 66 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/window_config.py b/window_config.py index 475a59bc..0a80b333 100644 --- a/window_config.py +++ b/window_config.py @@ -1,8 +1,8 @@ from os import path as os_path -from tkinter import DoubleVar +from tkinter import DoubleVar, IntVar from tkinter import font as tk_font import customtkinter -from customtkinter import CTkToplevel, CTkTabview, CTkFont, CTkLabel, CTkSlider, CTkOptionMenu, StringVar, CTkEntry, CTkCheckBox +from customtkinter import CTkToplevel, CTkTabview, CTkFont, CTkLabel, CTkSlider, CTkOptionMenu, StringVar, CTkEntry, CTkCheckBox, CTkProgressBar from flashtext import KeywordProcessor from utils import save_json, print_textbox @@ -10,6 +10,9 @@ from audio_utils import get_input_device_list, get_output_device_list from languages import translation_lang, transcription_lang class ToplevelWindowConfig(CTkToplevel): + MAX_MIC_ENERGY_THRESHOLD = 2000 + MAX_SPEAKER_ENERGY_THRESHOLD = 2000 + def __init__(self, parent, *args, **kwargs): super().__init__(parent, *args, **kwargs) self.parent = parent @@ -267,14 +270,26 @@ class ToplevelWindowConfig(CTkToplevel): fg_color="transparent", font=CTkFont(family=self.parent.FONT_FAMILY) ) - self.label_input_mic_energy_threshold.grid(row=row, column=0, columnspan=1, padx=padx, pady=pady, sticky="nsw") - self.entry_input_mic_energy_threshold = CTkEntry( + self.label_input_mic_energy_threshold.grid(row=row, column=0, rowspan=2, columnspan=1, padx=padx, pady=pady, sticky="nsw") + self.progressBar_input_mic_energy_threshold = CTkProgressBar( self.tabview_config.tab("Transcription"), - textvariable=StringVar(value=self.parent.INPUT_MIC_ENERGY_THRESHOLD), - font=CTkFont(family=self.parent.FONT_FAMILY) + corner_radius=0 ) - self.entry_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1 ,padx=padx, pady=pady, sticky="nsew") - self.entry_input_mic_energy_threshold.bind("", self.entry_input_mic_energy_threshold_callback) + self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") + + row +=1 + self.slider_input_mic_energy_threshold = customtkinter.CTkSlider( + self.tabview_config.tab("Transcription"), + from_=0, + to=self.MAX_MIC_ENERGY_THRESHOLD, + border_width=5, + button_length=0, + button_corner_radius=3, + number_of_steps=self.MAX_MIC_ENERGY_THRESHOLD, + command=self.slider_input_mic_energy_threshold_callback, + variable=IntVar(value=self.parent.INPUT_MIC_ENERGY_THRESHOLD), + ) + self.slider_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=0, sticky="nsew") ## checkbox input mic dynamic energy threshold row +=1 @@ -413,14 +428,27 @@ class ToplevelWindowConfig(CTkToplevel): fg_color="transparent", font=CTkFont(family=self.parent.FONT_FAMILY) ) - self.label_input_speaker_energy_threshold.grid(row=row, column=0, columnspan=1, padx=padx, pady=pady, sticky="nsw") - self.entry_input_speaker_energy_threshold = CTkEntry( + self.label_input_speaker_energy_threshold.grid(row=row, column=0, rowspan=2, columnspan=1, padx=padx, pady=pady, sticky="nsw") + + self.progressBar_input_speaker_energy_threshold = CTkProgressBar( self.tabview_config.tab("Transcription"), - textvariable=StringVar(value=self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD), - font=CTkFont(family=self.parent.FONT_FAMILY) + corner_radius=0 ) - self.entry_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1 ,padx=padx, pady=pady, sticky="nsew") - self.entry_input_speaker_energy_threshold.bind("", self.entry_input_speaker_energy_threshold_callback) + self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") + + row +=1 + self.slider_input_speaker_energy_threshold = customtkinter.CTkSlider( + self.tabview_config.tab("Transcription"), + from_=0, + to=self.MAX_SPEAKER_ENERGY_THRESHOLD, + border_width=5, + button_length=0, + button_corner_radius=3, + number_of_steps=self.MAX_SPEAKER_ENERGY_THRESHOLD, + command=self.slider_input_speaker_energy_threshold_callback, + variable=IntVar(value=self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD), + ) + self.slider_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=0, sticky="nsew") ## checkbox input speaker dynamic energy threshold row +=1 @@ -626,7 +654,6 @@ class ToplevelWindowConfig(CTkToplevel): self.optionmenu_input_mic_voice_language.configure(font=CTkFont(family=choice)) self.optionmenu_input_mic_voice_language._dropdown_menu.configure(font=CTkFont(family=choice)) self.label_input_mic_energy_threshold.configure(font=CTkFont(family=choice)) - self.entry_input_mic_energy_threshold.configure(font=CTkFont(family=choice)) self.label_input_mic_dynamic_energy_threshold.configure(font=CTkFont(family=choice)) self.label_input_mic_record_timeout.configure(font=CTkFont(family=choice)) self.entry_input_mic_record_timeout.configure(font=CTkFont(family=choice)) @@ -643,7 +670,6 @@ class ToplevelWindowConfig(CTkToplevel): self.optionmenu_input_speaker_voice_language.configure(font=CTkFont(family=choice)) self.optionmenu_input_speaker_voice_language._dropdown_menu.configure(font=CTkFont(family=choice)) self.label_input_speaker_energy_threshold.configure(font=CTkFont(family=choice)) - self.entry_input_speaker_energy_threshold.configure(font=CTkFont(family=choice)) self.label_input_speaker_dynamic_energy_threshold.configure(font=CTkFont(family=choice)) self.label_input_speaker_record_timeout.configure(font=CTkFont(family=choice)) self.entry_input_speaker_record_timeout.configure(font=CTkFont(family=choice)) @@ -736,8 +762,8 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.INPUT_MIC_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_MIC_VOICE_LANGUAGE", self.parent.INPUT_MIC_VOICE_LANGUAGE) - def entry_input_mic_energy_threshold_callback(self, event): - self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(self.entry_input_mic_energy_threshold.get()) + def slider_input_mic_energy_threshold_callback(self, value): + self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_MIC_ENERGY_THRESHOLD", self.parent.INPUT_MIC_ENERGY_THRESHOLD) def checkbox_input_mic_dynamic_energy_threshold_callback(self): @@ -772,8 +798,8 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.INPUT_SPEAKER_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_VOICE_LANGUAGE", self.parent.INPUT_SPEAKER_VOICE_LANGUAGE) - def entry_input_speaker_energy_threshold_callback(self, event): - self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(self.entry_input_speaker_energy_threshold.get()) + def slider_input_speaker_energy_threshold_callback(self, value): + self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_ENERGY_THRESHOLD", self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD) def checkbox_input_speaker_dynamic_energy_threshold_callback(self): From 0a8c7dd0d07bd15d5c0f32079508ab819a63a1de Mon Sep 17 00:00:00 2001 From: misygauziya Date: Sun, 9 Jul 2023 02:03:45 +0900 Subject: [PATCH 2/8] Check Point MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit このままだと動かない --- window_config.py | 50 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/window_config.py b/window_config.py index 0a80b333..66d7a840 100644 --- a/window_config.py +++ b/window_config.py @@ -1,4 +1,6 @@ +from time import sleep from os import path as os_path +from threading import Thread from tkinter import DoubleVar, IntVar from tkinter import font as tk_font import customtkinter @@ -7,11 +9,11 @@ from flashtext import KeywordProcessor from utils import save_json, print_textbox from audio_utils import get_input_device_list, get_output_device_list +from audio_recorder import SelectedMicRecorder, SelectedSpeakerRecorder from languages import translation_lang, transcription_lang class ToplevelWindowConfig(CTkToplevel): - MAX_MIC_ENERGY_THRESHOLD = 2000 - MAX_SPEAKER_ENERGY_THRESHOLD = 2000 + def __init__(self, parent, *args, **kwargs): super().__init__(parent, *args, **kwargs) @@ -24,6 +26,12 @@ class ToplevelWindowConfig(CTkToplevel): self.after(200, lambda: self.iconbitmap(os_path.join(os_path.dirname(__file__), "img", "app.ico"))) self.title("Config") + # init parameter + self.MAX_MIC_ENERGY_THRESHOLD = 2000 + self.MAX_SPEAKER_ENERGY_THRESHOLD = 4000 + self.FLAG_LOOP_MIC = True + self.FLAG_LOOP_SPEAKER = True + # tabwiew config self.tabview_config = CTkTabview(self) self.tabview_config.grid(row=0, column=0, padx=5, pady=5, sticky="nsew") @@ -276,6 +284,9 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") + self.th_progressBar_input_mic_energy_threshold_recorder = Thread(target=self.progressBar_input_mic_energy_threshold_recorder, daemon=True) + self.th_progressBar_input_mic_energy_threshold_recorder.start() + sleep(2) row +=1 self.slider_input_mic_energy_threshold = customtkinter.CTkSlider( @@ -435,7 +446,9 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - + self.th_progressBar_input_speaker_energy_threshold_recorder = Thread(target=self.progressBar_input_speaker_energy_threshold_recorder, daemon=True) + self.th_progressBar_input_speaker_energy_threshold_recorder.start() + row +=1 self.slider_input_speaker_energy_threshold = customtkinter.CTkSlider( self.tabview_config.tab("Transcription"), @@ -762,6 +775,19 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.INPUT_MIC_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_MIC_VOICE_LANGUAGE", self.parent.INPUT_MIC_VOICE_LANGUAGE) + def progressBar_input_mic_energy_threshold_recorder(self): + while self.FLAG_LOOP_MIC: + mic_device_name = self.parent.CHOICE_MIC_DEVICE + mic_device = [device for device in get_input_device_list() if device["name"] == mic_device_name][0] + re = SelectedMicRecorder(mic_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) + while self.FLAG_LOOP_MIC: + if mic_device_name != self.parent.CHOICE_MIC_DEVICE: + break + with re.source as source: + energy = re.recorder.listen_energy(source) + self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) + sleep(2) + def slider_input_mic_energy_threshold_callback(self, value): self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_MIC_ENERGY_THRESHOLD", self.parent.INPUT_MIC_ENERGY_THRESHOLD) @@ -798,6 +824,19 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.INPUT_SPEAKER_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_VOICE_LANGUAGE", self.parent.INPUT_SPEAKER_VOICE_LANGUAGE) + def progressBar_input_speaker_energy_threshold_recorder(self): + while self.FLAG_LOOP_SPEAKER: + speaker_device_name = self.parent.CHOICE_SPEAKER_DEVICE + speaker_device = [device for device in get_output_device_list() if device["name"] == speaker_device_name][0] + re = SelectedSpeakerRecorder(speaker_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) + while self.FLAG_LOOP_SPEAKER: + if speaker_device_name != self.parent.CHOICE_SPEAKER_DEVICE: + break + with re.source as source: + energy = re.recorder.listen_energy(source) + self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) + sleep(2) + def slider_input_speaker_energy_threshold_callback(self, value): self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_ENERGY_THRESHOLD", self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD) @@ -839,6 +878,11 @@ class ToplevelWindowConfig(CTkToplevel): pass def delete_window(self): + self.FLAG_LOOP_MIC = False + self.FLAG_LOOP_SPEAKER = False + self.th_progressBar_input_mic_energy_threshold_recorder.join() + self.th_progressBar_input_speaker_energy_threshold_recorder.join() + sleep(1) self.parent.checkbox_translation.configure(state="normal") self.parent.checkbox_transcription_send.configure(state="normal") self.parent.checkbox_transcription_receive.configure(state="normal") From 41df105bab84196a42bfa588faab44c3b1dd8ac9 Mon Sep 17 00:00:00 2001 From: misygauziya Date: Sun, 9 Jul 2023 03:51:55 +0900 Subject: [PATCH 3/8] Corrected process But unstable --- window_config.py | 61 ++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/window_config.py b/window_config.py index 66d7a840..acb834b9 100644 --- a/window_config.py +++ b/window_config.py @@ -1,13 +1,12 @@ from time import sleep from os import path as os_path -from threading import Thread from tkinter import DoubleVar, IntVar from tkinter import font as tk_font import customtkinter from customtkinter import CTkToplevel, CTkTabview, CTkFont, CTkLabel, CTkSlider, CTkOptionMenu, StringVar, CTkEntry, CTkCheckBox, CTkProgressBar from flashtext import KeywordProcessor -from utils import save_json, print_textbox +from utils import save_json, print_textbox, thread_fnc from audio_utils import get_input_device_list, get_output_device_list from audio_recorder import SelectedMicRecorder, SelectedSpeakerRecorder from languages import translation_lang, transcription_lang @@ -29,8 +28,8 @@ class ToplevelWindowConfig(CTkToplevel): # init parameter self.MAX_MIC_ENERGY_THRESHOLD = 2000 self.MAX_SPEAKER_ENERGY_THRESHOLD = 4000 - self.FLAG_LOOP_MIC = True - self.FLAG_LOOP_SPEAKER = True + self.last_mic_device_name = None + self.last_speaker_device_name = None # tabwiew config self.tabview_config = CTkTabview(self) @@ -284,7 +283,8 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - self.th_progressBar_input_mic_energy_threshold_recorder = Thread(target=self.progressBar_input_mic_energy_threshold_recorder, daemon=True) + self.th_progressBar_input_mic_energy_threshold_recorder = thread_fnc(fnc=self.progressBar_input_mic_energy_threshold_recorder) + self.th_progressBar_input_mic_energy_threshold_recorder.daemon = True self.th_progressBar_input_mic_energy_threshold_recorder.start() sleep(2) @@ -446,7 +446,8 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - self.th_progressBar_input_speaker_energy_threshold_recorder = Thread(target=self.progressBar_input_speaker_energy_threshold_recorder, daemon=True) + self.th_progressBar_input_speaker_energy_threshold_recorder = thread_fnc(fnc=self.progressBar_input_speaker_energy_threshold_recorder) + self.th_progressBar_input_speaker_energy_threshold_recorder.daemon=True self.th_progressBar_input_speaker_energy_threshold_recorder.start() row +=1 @@ -776,17 +777,20 @@ class ToplevelWindowConfig(CTkToplevel): save_json(self.parent.PATH_CONFIG, "INPUT_MIC_VOICE_LANGUAGE", self.parent.INPUT_MIC_VOICE_LANGUAGE) def progressBar_input_mic_energy_threshold_recorder(self): - while self.FLAG_LOOP_MIC: - mic_device_name = self.parent.CHOICE_MIC_DEVICE - mic_device = [device for device in get_input_device_list() if device["name"] == mic_device_name][0] - re = SelectedMicRecorder(mic_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) - while self.FLAG_LOOP_MIC: - if mic_device_name != self.parent.CHOICE_MIC_DEVICE: + self.last_mic_device_name = self.parent.CHOICE_MIC_DEVICE + mic_device = [device for device in get_input_device_list() if device["name"] == self.last_mic_device_name][0] + re = SelectedMicRecorder(mic_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) + try: + while True: + if self.last_mic_device_name != self.parent.CHOICE_MIC_DEVICE: break with re.source as source: energy = re.recorder.listen_energy(source) self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) - sleep(2) + sleep(0.05) + except: + pass + sleep(5) def slider_input_mic_energy_threshold_callback(self, value): self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(value) @@ -825,17 +829,20 @@ class ToplevelWindowConfig(CTkToplevel): save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_VOICE_LANGUAGE", self.parent.INPUT_SPEAKER_VOICE_LANGUAGE) def progressBar_input_speaker_energy_threshold_recorder(self): - while self.FLAG_LOOP_SPEAKER: - speaker_device_name = self.parent.CHOICE_SPEAKER_DEVICE - speaker_device = [device for device in get_output_device_list() if device["name"] == speaker_device_name][0] - re = SelectedSpeakerRecorder(speaker_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) - while self.FLAG_LOOP_SPEAKER: - if speaker_device_name != self.parent.CHOICE_SPEAKER_DEVICE: + self.last_speaker_device_name = self.parent.CHOICE_SPEAKER_DEVICE + speaker_device = [device for device in get_output_device_list() if device["name"] == self.last_speaker_device_name][0] + re = SelectedSpeakerRecorder(speaker_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) + try: + while True: + if self.last_speaker_device_name != self.parent.CHOICE_SPEAKER_DEVICE: break with re.source as source: energy = re.recorder.listen_energy(source) self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) - sleep(2) + sleep(0.05) + except: + pass + sleep(5) def slider_input_speaker_energy_threshold_callback(self, value): self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value) @@ -878,11 +885,15 @@ class ToplevelWindowConfig(CTkToplevel): pass def delete_window(self): - self.FLAG_LOOP_MIC = False - self.FLAG_LOOP_SPEAKER = False - self.th_progressBar_input_mic_energy_threshold_recorder.join() - self.th_progressBar_input_speaker_energy_threshold_recorder.join() - sleep(1) + + if isinstance(self.th_progressBar_input_mic_energy_threshold_recorder, thread_fnc): + self.th_progressBar_input_mic_energy_threshold_recorder.stop() + self.last_mic_device_name = None + + if isinstance(self.th_progressBar_input_speaker_energy_threshold_recorder, thread_fnc): + self.th_progressBar_input_speaker_energy_threshold_recorder.stop() + self.last_speaker_device_name = None + self.parent.checkbox_translation.configure(state="normal") self.parent.checkbox_transcription_send.configure(state="normal") self.parent.checkbox_transcription_receive.configure(state="normal") From 14d3a4a33e14e2c0211744fc8ffe3ede71acd026 Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 11 Jul 2023 00:40:39 +0900 Subject: [PATCH 4/8] add SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder --- audio_recorder.py | 46 ++++++++++++++++++- window_config.py | 110 ++++++++++++++++++++++++++-------------------- 2 files changed, 108 insertions(+), 48 deletions(-) diff --git a/audio_recorder.py b/audio_recorder.py index 0b146677..9d63001e 100644 --- a/audio_recorder.py +++ b/audio_recorder.py @@ -21,7 +21,7 @@ class BaseRecorder: def record_into_queue(self, audio_queue): def record_callback(_, audio): - audio_queue.put((audio.get_raw_data(), datetime.now())) + audio_queue.put((audio[0].get_raw_data(), audio[1], datetime.now())) self.stop = self.recorder.listen_in_background(self.source, record_callback, phrase_time_limit=self.record_timeout) @@ -44,4 +44,48 @@ class SelectedSpeakerRecorder(BaseRecorder): channels=device["maxInputChannels"] ) super().__init__(source=source, energy_threshold=energy_threshold, dynamic_energy_threshold=dynamic_energy_threshold, record_timeout=record_timeout) + self.adjust_for_noise() + +class BaseEnergyRecorder: + def __init__(self, source): + self.recorder = Recognizer() + self.recorder.energy_threshold = 0 + self.recorder.dynamic_energy_threshold = False + self.record_timeout = 0 + self.stop = None + + if source is None: + raise ValueError("audio source can't be None") + + self.source = source + + def adjust_for_noise(self): + with self.source: + self.recorder.adjust_for_ambient_noise(self.source) + + def record_into_queue(self, energy_queue): + def record_callback(_, energy): + energy_queue.put(energy) + + self.stop = self.recorder.listen_energy_in_background(self.source, record_callback) + +class SelectedMicEnergyRecorder(BaseEnergyRecorder): + def __init__(self, device): + source=Microphone( + device_index=device['index'], + sample_rate=int(device["defaultSampleRate"]), + ) + super().__init__(source=source) + self.adjust_for_noise() + +class SelectedSpeakeEnergyRecorder(BaseEnergyRecorder): + def __init__(self, device): + + 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.adjust_for_noise() \ No newline at end of file diff --git a/window_config.py b/window_config.py index acb834b9..0462e261 100644 --- a/window_config.py +++ b/window_config.py @@ -1,4 +1,5 @@ from time import sleep +from queue import Queue from os import path as os_path from tkinter import DoubleVar, IntVar from tkinter import font as tk_font @@ -8,12 +9,11 @@ from flashtext import KeywordProcessor from utils import save_json, print_textbox, thread_fnc from audio_utils import get_input_device_list, get_output_device_list -from audio_recorder import SelectedMicRecorder, SelectedSpeakerRecorder +from audio_recorder import SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder from languages import translation_lang, transcription_lang class ToplevelWindowConfig(CTkToplevel): - def __init__(self, parent, *args, **kwargs): super().__init__(parent, *args, **kwargs) self.parent = parent @@ -27,7 +27,7 @@ class ToplevelWindowConfig(CTkToplevel): # init parameter self.MAX_MIC_ENERGY_THRESHOLD = 2000 - self.MAX_SPEAKER_ENERGY_THRESHOLD = 4000 + self.MAX_SPEAKER_ENERGY_THRESHOLD = 2000 self.last_mic_device_name = None self.last_speaker_device_name = None @@ -283,11 +283,21 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - self.th_progressBar_input_mic_energy_threshold_recorder = thread_fnc(fnc=self.progressBar_input_mic_energy_threshold_recorder) - self.th_progressBar_input_mic_energy_threshold_recorder.daemon = True - self.th_progressBar_input_mic_energy_threshold_recorder.start() + + self.mic_energy_queue = Queue() + mic_device = [device for device in get_input_device_list() if device["name"] == self.parent.CHOICE_MIC_DEVICE][0] + + try: + self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) + self.mic_energy_recorder.record_into_queue(self.mic_energy_queue) + except Exception as e: + print(e) sleep(2) + self.mic_energy_plot_progressbar = thread_fnc(self.progressBar_input_mic_energy_plot) + self.mic_energy_plot_progressbar.daemon = True + self.mic_energy_plot_progressbar.start() + row +=1 self.slider_input_mic_energy_threshold = customtkinter.CTkSlider( self.tabview_config.tab("Transcription"), @@ -446,9 +456,19 @@ class ToplevelWindowConfig(CTkToplevel): corner_radius=0 ) self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - self.th_progressBar_input_speaker_energy_threshold_recorder = thread_fnc(fnc=self.progressBar_input_speaker_energy_threshold_recorder) - self.th_progressBar_input_speaker_energy_threshold_recorder.daemon=True - self.th_progressBar_input_speaker_energy_threshold_recorder.start() + + self.speaker_energy_queue = Queue() + speaker_device = [device for device in get_output_device_list() if device["name"] == self.parent.CHOICE_SPEAKER_DEVICE][0] + try: + self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) + self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) + except Exception as e: + print(e) + sleep(2) + + self.speaker_energy_plot_progressbar = thread_fnc(self.progressBar_input_speaker_energy_plot) + self.speaker_energy_plot_progressbar.daemon = True + self.speaker_energy_plot_progressbar.start() row +=1 self.slider_input_speaker_energy_threshold = customtkinter.CTkSlider( @@ -772,25 +792,25 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.CHOICE_MIC_DEVICE = choice save_json(self.parent.PATH_CONFIG, "CHOICE_MIC_DEVICE", self.parent.CHOICE_MIC_DEVICE) + self.mic_energy_recorder.stop() + self.mic_energy_recorder.stop = None + sleep(2) + try: + mic_device = [device for device in get_input_device_list() if device["name"] == self.parent.CHOICE_MIC_DEVICE][0] + self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) + self.mic_energy_recorder.record_into_queue(self.mic_energy_queue) + except Exception as e: + print(e) + def optionmenu_input_mic_voice_language_callback(self, choice): self.parent.INPUT_MIC_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_MIC_VOICE_LANGUAGE", self.parent.INPUT_MIC_VOICE_LANGUAGE) - def progressBar_input_mic_energy_threshold_recorder(self): - self.last_mic_device_name = self.parent.CHOICE_MIC_DEVICE - mic_device = [device for device in get_input_device_list() if device["name"] == self.last_mic_device_name][0] - re = SelectedMicRecorder(mic_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) - try: - while True: - if self.last_mic_device_name != self.parent.CHOICE_MIC_DEVICE: - break - with re.source as source: - energy = re.recorder.listen_energy(source) - self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) - sleep(0.05) - except: - pass - sleep(5) + def progressBar_input_mic_energy_plot(self): + if self.mic_energy_queue.empty() is False: + energy = self.mic_energy_queue.get() + self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) + sleep(0.01) def slider_input_mic_energy_threshold_callback(self, value): self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(value) @@ -824,25 +844,25 @@ class ToplevelWindowConfig(CTkToplevel): self.parent.CHOICE_SPEAKER_DEVICE = choice save_json(self.parent.PATH_CONFIG, "CHOICE_SPEAKER_DEVICE", self.parent.CHOICE_SPEAKER_DEVICE) + self.speaker_energy_recorder.stop() + self.speaker_energy_recorder.stop = None + sleep(2) + try: + speaker_device = [device for device in get_output_device_list() if device["name"] == self.parent.CHOICE_SPEAKER_DEVICE][0] + self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) + self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) + except Exception as e: + print(e) + def optionmenu_input_speaker_voice_language_callback(self, choice): self.parent.INPUT_SPEAKER_VOICE_LANGUAGE = choice save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_VOICE_LANGUAGE", self.parent.INPUT_SPEAKER_VOICE_LANGUAGE) - def progressBar_input_speaker_energy_threshold_recorder(self): - self.last_speaker_device_name = self.parent.CHOICE_SPEAKER_DEVICE - speaker_device = [device for device in get_output_device_list() if device["name"] == self.last_speaker_device_name][0] - re = SelectedSpeakerRecorder(speaker_device, energy_threshold=0, dynamic_energy_threshold=False, record_timeout=0) - try: - while True: - if self.last_speaker_device_name != self.parent.CHOICE_SPEAKER_DEVICE: - break - with re.source as source: - energy = re.recorder.listen_energy(source) - self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) - sleep(0.05) - except: - pass - sleep(5) + def progressBar_input_speaker_energy_plot(self): + if self.speaker_energy_queue.empty() is False: + energy = self.speaker_energy_queue.get() + self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) + sleep(0.01) def slider_input_speaker_energy_threshold_callback(self, value): self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value) @@ -885,15 +905,11 @@ class ToplevelWindowConfig(CTkToplevel): pass def delete_window(self): - - if isinstance(self.th_progressBar_input_mic_energy_threshold_recorder, thread_fnc): - self.th_progressBar_input_mic_energy_threshold_recorder.stop() - self.last_mic_device_name = None + self.mic_energy_recorder.stop() + self.mic_energy_plot_progressbar.stop() + self.speaker_energy_recorder.stop() + self.speaker_energy_plot_progressbar.stop() - if isinstance(self.th_progressBar_input_speaker_energy_threshold_recorder, thread_fnc): - self.th_progressBar_input_speaker_energy_threshold_recorder.stop() - self.last_speaker_device_name = None - self.parent.checkbox_translation.configure(state="normal") self.parent.checkbox_transcription_send.configure(state="normal") self.parent.checkbox_transcription_receive.configure(state="normal") From 574133034ded716dc2443e7505457502fe21f366 Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 11 Jul 2023 01:20:50 +0900 Subject: [PATCH 5/8] fix typo --- audio_recorder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio_recorder.py b/audio_recorder.py index 9d63001e..ab03d78b 100644 --- a/audio_recorder.py +++ b/audio_recorder.py @@ -21,7 +21,7 @@ class BaseRecorder: def record_into_queue(self, audio_queue): def record_callback(_, audio): - audio_queue.put((audio[0].get_raw_data(), audio[1], datetime.now())) + audio_queue.put((audio.get_raw_data(), datetime.now())) self.stop = self.recorder.listen_in_background(self.source, record_callback, phrase_time_limit=self.record_timeout) From d6e950f66256fc7ceb0b0aa3bdfbac1fc8b1bfbc Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 11 Jul 2023 10:03:57 +0900 Subject: [PATCH 6/8] update progressBar energy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit マイクとスピーカーのthresholdの閾値を可視化 --- window_config.py | 185 +++++++++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 78 deletions(-) diff --git a/window_config.py b/window_config.py index 0462e261..1be950e5 100644 --- a/window_config.py +++ b/window_config.py @@ -1,5 +1,6 @@ from time import sleep from queue import Queue +from threading import Thread from os import path as os_path from tkinter import DoubleVar, IntVar from tkinter import font as tk_font @@ -8,7 +9,7 @@ from customtkinter import CTkToplevel, CTkTabview, CTkFont, CTkLabel, CTkSlider, from flashtext import KeywordProcessor from utils import save_json, print_textbox, thread_fnc -from audio_utils import get_input_device_list, get_output_device_list +from audio_utils import get_input_device_list, get_output_device_list, get_default_output_device from audio_recorder import SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder from languages import translation_lang, transcription_lang @@ -27,9 +28,11 @@ class ToplevelWindowConfig(CTkToplevel): # init parameter self.MAX_MIC_ENERGY_THRESHOLD = 2000 - self.MAX_SPEAKER_ENERGY_THRESHOLD = 2000 - self.last_mic_device_name = None - self.last_speaker_device_name = None + self.MAX_SPEAKER_ENERGY_THRESHOLD = 4000 + self.mic_energy_recorder = None + self.mic_energy_plot_progressbar = None + self.speaker_energy_recorder = None + self.speaker_energy_plot_progressbar = None # tabwiew config self.tabview_config = CTkTabview(self) @@ -269,7 +272,7 @@ class ToplevelWindowConfig(CTkToplevel): self.optionmenu_input_mic_voice_language.grid(row=row, column=1, columnspan=1 ,padx=padx, pady=pady, sticky="nsew") self.optionmenu_input_mic_voice_language._dropdown_menu.configure(font=CTkFont(family=self.parent.FONT_FAMILY)) - ## entry input mic energy threshold + ## slider input mic energy threshold row +=1 self.label_input_mic_energy_threshold = CTkLabel( self.tabview_config.tab("Transcription"), @@ -277,40 +280,39 @@ class ToplevelWindowConfig(CTkToplevel): fg_color="transparent", font=CTkFont(family=self.parent.FONT_FAMILY) ) - self.label_input_mic_energy_threshold.grid(row=row, column=0, rowspan=2, columnspan=1, padx=padx, pady=pady, sticky="nsw") - self.progressBar_input_mic_energy_threshold = CTkProgressBar( - self.tabview_config.tab("Transcription"), - corner_radius=0 - ) - self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - - self.mic_energy_queue = Queue() - mic_device = [device for device in get_input_device_list() if device["name"] == self.parent.CHOICE_MIC_DEVICE][0] - - try: - self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) - self.mic_energy_recorder.record_into_queue(self.mic_energy_queue) - except Exception as e: - print(e) - sleep(2) + self.label_input_mic_energy_threshold.grid(row=row, column=0, columnspan=1, padx=padx, pady=pady, sticky="nsw") - self.mic_energy_plot_progressbar = thread_fnc(self.progressBar_input_mic_energy_plot) - self.mic_energy_plot_progressbar.daemon = True - self.mic_energy_plot_progressbar.start() - - row +=1 self.slider_input_mic_energy_threshold = customtkinter.CTkSlider( self.tabview_config.tab("Transcription"), from_=0, to=self.MAX_MIC_ENERGY_THRESHOLD, - border_width=5, + border_width=7, button_length=0, button_corner_radius=3, number_of_steps=self.MAX_MIC_ENERGY_THRESHOLD, command=self.slider_input_mic_energy_threshold_callback, variable=IntVar(value=self.parent.INPUT_MIC_ENERGY_THRESHOLD), ) - self.slider_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=0, sticky="nsew") + self.slider_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=5, sticky="nsew") + + ## progressBar input mic energy threshold + row +=1 + self.checkbox_input_mic_threshold_check = CTkCheckBox( + self.tabview_config.tab("Transcription"), + text="check threshold point", + onvalue=True, + offvalue=False, + command=self.checkbox_input_mic_threshold_check_callback, + font=CTkFont(family=self.parent.FONT_FAMILY) + ) + self.checkbox_input_mic_threshold_check.grid(row=row, column=0, columnspan=1 ,padx=padx, pady=pady, sticky="nsw") + + self.progressBar_input_mic_energy_threshold = CTkProgressBar( + self.tabview_config.tab("Transcription"), + corner_radius=0 + ) + self.progressBar_input_mic_energy_threshold.grid(row=row, column=1, columnspan=1, padx=padx, pady=5, sticky="nsew") + self.progressBar_input_mic_energy_threshold.set(0) ## checkbox input mic dynamic energy threshold row +=1 @@ -449,40 +451,40 @@ class ToplevelWindowConfig(CTkToplevel): fg_color="transparent", font=CTkFont(family=self.parent.FONT_FAMILY) ) - self.label_input_speaker_energy_threshold.grid(row=row, column=0, rowspan=2, columnspan=1, padx=padx, pady=pady, sticky="nsw") + self.label_input_speaker_energy_threshold.grid(row=row, column=0, columnspan=1, padx=padx, pady=pady, sticky="nsw") - self.progressBar_input_speaker_energy_threshold = CTkProgressBar( - self.tabview_config.tab("Transcription"), - corner_radius=0 - ) - self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=5, pady=(5,0), sticky="nsew") - - self.speaker_energy_queue = Queue() - speaker_device = [device for device in get_output_device_list() if device["name"] == self.parent.CHOICE_SPEAKER_DEVICE][0] - try: - self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) - self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) - except Exception as e: - print(e) - sleep(2) - - self.speaker_energy_plot_progressbar = thread_fnc(self.progressBar_input_speaker_energy_plot) - self.speaker_energy_plot_progressbar.daemon = True - self.speaker_energy_plot_progressbar.start() - - row +=1 + ## progressBar input speaker energy threshold self.slider_input_speaker_energy_threshold = customtkinter.CTkSlider( self.tabview_config.tab("Transcription"), from_=0, to=self.MAX_SPEAKER_ENERGY_THRESHOLD, - border_width=5, + border_width=7, button_length=0, button_corner_radius=3, number_of_steps=self.MAX_SPEAKER_ENERGY_THRESHOLD, command=self.slider_input_speaker_energy_threshold_callback, variable=IntVar(value=self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD), ) - self.slider_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=0, sticky="nsew") + self.slider_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=0, pady=5, sticky="nsew") + + ## progressBar input speaker energy threshold + row +=1 + self.checkbox_input_speaker_threshold_check = CTkCheckBox( + self.tabview_config.tab("Transcription"), + text="check threshold point", + onvalue=True, + offvalue=False, + command=self.checkbox_input_speaker_threshold_check_callback, + font=CTkFont(family=self.parent.FONT_FAMILY) + ) + self.checkbox_input_speaker_threshold_check.grid(row=row, column=0, columnspan=1 ,padx=padx, pady=pady, sticky="nsw") + + self.progressBar_input_speaker_energy_threshold = CTkProgressBar( + self.tabview_config.tab("Transcription"), + corner_radius=0 + ) + self.progressBar_input_speaker_energy_threshold.grid(row=row, column=1, columnspan=1, padx=padx, pady=5, sticky="nsew") + self.progressBar_input_speaker_energy_threshold.set(0) ## checkbox input speaker dynamic energy threshold row +=1 @@ -791,16 +793,8 @@ class ToplevelWindowConfig(CTkToplevel): def optionmenu_input_mic_device_callback(self, choice): self.parent.CHOICE_MIC_DEVICE = choice save_json(self.parent.PATH_CONFIG, "CHOICE_MIC_DEVICE", self.parent.CHOICE_MIC_DEVICE) - - self.mic_energy_recorder.stop() - self.mic_energy_recorder.stop = None - sleep(2) - try: - mic_device = [device for device in get_input_device_list() if device["name"] == self.parent.CHOICE_MIC_DEVICE][0] - self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) - self.mic_energy_recorder.record_into_queue(self.mic_energy_queue) - except Exception as e: - print(e) + self.checkbox_input_mic_threshold_check.deselect() + self.checkbox_input_mic_threshold_check_callback() def optionmenu_input_mic_voice_language_callback(self, choice): self.parent.INPUT_MIC_VOICE_LANGUAGE = choice @@ -809,9 +803,28 @@ class ToplevelWindowConfig(CTkToplevel): def progressBar_input_mic_energy_plot(self): if self.mic_energy_queue.empty() is False: energy = self.mic_energy_queue.get() - self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) + try: + self.progressBar_input_mic_energy_threshold.set(energy/self.MAX_MIC_ENERGY_THRESHOLD) + except: + pass sleep(0.01) + def checkbox_input_mic_threshold_check_callback(self): + if self.checkbox_input_mic_threshold_check.get(): + self.mic_energy_queue = Queue() + mic_device = [device for device in get_input_device_list() if device["name"] == self.parent.CHOICE_MIC_DEVICE][0] + self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) + self.mic_energy_recorder.record_into_queue(self.mic_energy_queue) + self.mic_energy_plot_progressbar = thread_fnc(self.progressBar_input_mic_energy_plot) + self.mic_energy_plot_progressbar.daemon = True + self.mic_energy_plot_progressbar.start() + else: + 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.progressBar_input_mic_energy_threshold.set(0) + def slider_input_mic_energy_threshold_callback(self, value): self.parent.INPUT_MIC_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_MIC_ENERGY_THRESHOLD", self.parent.INPUT_MIC_ENERGY_THRESHOLD) @@ -843,16 +856,8 @@ class ToplevelWindowConfig(CTkToplevel): def optionmenu_input_speaker_device_callback(self, choice): self.parent.CHOICE_SPEAKER_DEVICE = choice save_json(self.parent.PATH_CONFIG, "CHOICE_SPEAKER_DEVICE", self.parent.CHOICE_SPEAKER_DEVICE) - - self.speaker_energy_recorder.stop() - self.speaker_energy_recorder.stop = None - sleep(2) - try: - speaker_device = [device for device in get_output_device_list() if device["name"] == self.parent.CHOICE_SPEAKER_DEVICE][0] - self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) - self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) - except Exception as e: - print(e) + self.checkbox_input_speaker_threshold_check.deselect() + self.checkbox_input_speaker_threshold_check_callback() def optionmenu_input_speaker_voice_language_callback(self, choice): self.parent.INPUT_SPEAKER_VOICE_LANGUAGE = choice @@ -861,9 +866,33 @@ class ToplevelWindowConfig(CTkToplevel): def progressBar_input_speaker_energy_plot(self): if self.speaker_energy_queue.empty() is False: energy = self.speaker_energy_queue.get() - self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) + try: + self.progressBar_input_speaker_energy_threshold.set(energy/self.MAX_SPEAKER_ENERGY_THRESHOLD) + except: + pass sleep(0.01) + def checkbox_input_speaker_threshold_check_callback(self): + if self.checkbox_input_speaker_threshold_check.get(): + self.speaker_energy_queue = Queue() + speaker_device = [device for device in get_output_device_list() if device["name"] == self.parent.CHOICE_SPEAKER_DEVICE][0] + + if get_default_output_device()["index"] == speaker_device["index"]: + self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) + self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) + self.speaker_energy_plot_progressbar = thread_fnc(self.progressBar_input_speaker_energy_plot) + self.speaker_energy_plot_progressbar.daemon = True + self.speaker_energy_plot_progressbar.start() + else: + print_textbox(self.parent.textbox_message_log, "Windows playback device and selected device do not match. Change the Windows playback device.", "ERROR") + self.checkbox_input_speaker_threshold_check.deselect() + else: + 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.progressBar_input_speaker_energy_threshold.set(0) + def slider_input_speaker_energy_threshold_callback(self, value): self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value) save_json(self.parent.PATH_CONFIG, "INPUT_SPEAKER_ENERGY_THRESHOLD", self.parent.INPUT_SPEAKER_ENERGY_THRESHOLD) @@ -905,11 +934,11 @@ class ToplevelWindowConfig(CTkToplevel): pass def delete_window(self): - self.mic_energy_recorder.stop() - self.mic_energy_plot_progressbar.stop() - self.speaker_energy_recorder.stop() - self.speaker_energy_plot_progressbar.stop() - + self.checkbox_input_mic_threshold_check.deselect() + self.checkbox_input_speaker_threshold_check.deselect() + self.checkbox_input_mic_threshold_check_callback() + self.checkbox_input_speaker_threshold_check_callback() + self.parent.checkbox_translation.configure(state="normal") self.parent.checkbox_transcription_send.configure(state="normal") self.parent.checkbox_transcription_receive.configure(state="normal") From 44b3b7de33411f58249c14b4ea259160121d243b Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 11 Jul 2023 10:52:20 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=82=B9=E3=83=94=E3=83=BC=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=87=BA=E5=8A=9B=E3=81=A0=E3=81=91=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- window_config.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/window_config.py b/window_config.py index 1be950e5..2b3c5c89 100644 --- a/window_config.py +++ b/window_config.py @@ -32,6 +32,7 @@ class ToplevelWindowConfig(CTkToplevel): self.mic_energy_recorder = None self.mic_energy_plot_progressbar = None self.speaker_energy_recorder = None + self.speaker_energy_get_progressbar = None self.speaker_energy_plot_progressbar = None # tabwiew config @@ -872,6 +873,11 @@ class ToplevelWindowConfig(CTkToplevel): pass sleep(0.01) + def progressBar_input_speaker_energy_get(self): + with self.speaker_energy_recorder.source as source: + energy = self.speaker_energy_recorder.recorder.listen_energy(source) + self.speaker_energy_queue.put(energy) + def checkbox_input_speaker_threshold_check_callback(self): if self.checkbox_input_speaker_threshold_check.get(): self.speaker_energy_queue = Queue() @@ -879,7 +885,9 @@ class ToplevelWindowConfig(CTkToplevel): if get_default_output_device()["index"] == speaker_device["index"]: self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) - self.speaker_energy_recorder.record_into_queue(self.speaker_energy_queue) + self.speaker_energy_get_progressbar = thread_fnc(self.progressBar_input_speaker_energy_get) + self.speaker_energy_get_progressbar.daemon = True + self.speaker_energy_get_progressbar.start() self.speaker_energy_plot_progressbar = thread_fnc(self.progressBar_input_speaker_energy_plot) self.speaker_energy_plot_progressbar.daemon = True self.speaker_energy_plot_progressbar.start() @@ -887,8 +895,10 @@ class ToplevelWindowConfig(CTkToplevel): print_textbox(self.parent.textbox_message_log, "Windows playback device and selected device do not match. Change the Windows playback device.", "ERROR") self.checkbox_input_speaker_threshold_check.deselect() else: - if self.speaker_energy_recorder != None: - self.speaker_energy_recorder.stop() + 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() self.progressBar_input_speaker_energy_threshold.set(0) From f4099e5e76c00cb740b4db301d95adff139183de Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 11 Jul 2023 11:16:43 +0900 Subject: [PATCH 8/8] remove comment out --- window_config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/window_config.py b/window_config.py index 2b3c5c89..516a4371 100644 --- a/window_config.py +++ b/window_config.py @@ -897,8 +897,6 @@ class ToplevelWindowConfig(CTkToplevel): else: 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() self.progressBar_input_speaker_energy_threshold.set(0)