diff --git a/VRCT.py b/VRCT.py index 698c2d19..bec6fb5b 100644 --- a/VRCT.py +++ b/VRCT.py @@ -36,18 +36,18 @@ class App(customtkinter.CTk): self.UI_SCALING = "100%" self.FONT_FAMILY = "Yu Gothic UI" ## Translation - self.CHOICE_TRANSLATOR = "DeepL(web)" - self.INPUT_SOURCE_LANG = list(languages.deepl_translate_lang.keys())[0] - self.INPUT_TARGET_LANG = list(languages.deepl_translate_lang.keys())[1] - self.OUTPUT_SOURCE_LANG = list(languages.deepl_translate_lang.keys())[1] - self.OUTPUT_TARGET_LANG = list(languages.deepl_translate_lang.keys())[0] + self.CHOICE_TRANSLATOR = languages.translators[0] + self.INPUT_SOURCE_LANG = list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys())[0] + self.INPUT_TARGET_LANG = list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys())[1] + self.OUTPUT_SOURCE_LANG = list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys())[1] + self.OUTPUT_TARGET_LANG = list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys())[0] ## Transcription self.CHOICE_MIC_DEVICE = audio_utils.get_default_input_device()["name"] - self.INPUT_MIC_VOICE_LANGUAGE = list(languages.recognize_lang.keys())[0] + self.INPUT_MIC_VOICE_LANGUAGE = list(languages.transcription_lang.keys())[0] self.INPUT_MIC_IS_DYNAMIC = False self.INPUT_MIC_THRESHOLD = 300 self.CHOICE_SPEAKER_DEVICE = audio_utils.get_default_output_device()["name"] - self.INPUT_SPEAKER_VOICE_LANGUAGE = list(languages.recognize_lang.keys())[1] + self.INPUT_SPEAKER_VOICE_LANGUAGE = list(languages.transcription_lang.keys())[1] self.INPUT_SPEAKER_INTERVAL = 4 ## Parameter @@ -99,16 +99,16 @@ class App(customtkinter.CTk): if config["CHOICE_TRANSLATOR"] in list(self.translator.translator_status.keys()): self.CHOICE_TRANSLATOR = config["CHOICE_TRANSLATOR"] if "INPUT_SOURCE_LANG" in config.keys(): - if config["INPUT_SOURCE_LANG"] in self.translator.languages[self.CHOICE_TRANSLATOR]: + if config["INPUT_SOURCE_LANG"] in list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys()): self.INPUT_SOURCE_LANG = config["INPUT_SOURCE_LANG"] if "INPUT_TARGET_LANG" in config.keys(): - if config["INPUT_SOURCE_LANG"] in self.translator.languages[self.CHOICE_TRANSLATOR]: + if config["INPUT_SOURCE_LANG"] in list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys()): self.INPUT_TARGET_LANG = config["INPUT_TARGET_LANG"] if "OUTPUT_SOURCE_LANG" in config.keys(): - if config["INPUT_SOURCE_LANG"] in self.translator.languages[self.CHOICE_TRANSLATOR]: + if config["INPUT_SOURCE_LANG"] in list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys()): self.OUTPUT_SOURCE_LANG = config["OUTPUT_SOURCE_LANG"] if "OUTPUT_TARGET_LANG" in config.keys(): - if config["INPUT_SOURCE_LANG"] in self.translator.languages[self.CHOICE_TRANSLATOR]: + if config["INPUT_SOURCE_LANG"] in list(languages.translation_lang[self.CHOICE_TRANSLATOR].keys()): self.OUTPUT_TARGET_LANG = config["OUTPUT_TARGET_LANG"] # Transcription @@ -116,7 +116,7 @@ class App(customtkinter.CTk): if config["CHOICE_MIC_DEVICE"] in [device["name"] for device in audio_utils.get_input_device_list()]: self.CHOICE_MIC_DEVICE = config["CHOICE_MIC_DEVICE"] if "INPUT_MIC_VOICE_LANGUAGE" in config.keys(): - if config["INPUT_MIC_VOICE_LANGUAGE"] in list(languages.recognize_lang.keys()): + if config["INPUT_MIC_VOICE_LANGUAGE"] in list(languages.transcription_lang.keys()): self.INPUT_MIC_VOICE_LANGUAGE = config["INPUT_MIC_VOICE_LANGUAGE"] if "INPUT_MIC_IS_DYNAMIC" in config.keys(): if type(config["INPUT_MIC_IS_DYNAMIC"]) is bool: @@ -128,7 +128,7 @@ class App(customtkinter.CTk): if config["CHOICE_SPEAKER_DEVICE"] in [device["name"] for device in audio_utils.get_output_device_list()]: self.CHOICE_SPEAKER_DEVICE = config["CHOICE_SPEAKER_DEVICE"] if "INPUT_SPEAKER_VOICE_LANGUAGE" in config.keys(): - if config["INPUT_SPEAKER_VOICE_LANGUAGE"] in list(languages.recognize_lang.keys()): + if config["INPUT_SPEAKER_VOICE_LANGUAGE"] in list(languages.transcription_lang.keys()): self.INPUT_SPEAKER_VOICE_LANGUAGE = config["INPUT_SPEAKER_VOICE_LANGUAGE"] if "INPUT_SPEAKER_INTERVAL" in config.keys(): if type(config["INPUT_SPEAKER_INTERVAL"]) is int: @@ -396,13 +396,13 @@ class App(customtkinter.CTk): self.ENABLE_TRANSCRIPTION_SEND = self.checkbox_transcription_send.get() if self.ENABLE_TRANSCRIPTION_SEND is True: self.mic_audio_queue = queue.Queue() - mic_device = audio_utils.get_default_input_device() + mic_device = [device for device in audio_utils.get_input_device_list() if device["name"] == self.CHOICE_MIC_DEVICE][0] self.mic_audio_recorder = audio_recorder.SelectedMicRecorder(mic_device) self.mic_audio_recorder.record_into_queue(self.mic_audio_queue) self.mic_transcriber = audio_transcriber.AudioTranscriber( speaker=False, source=self.mic_audio_recorder.source, - language=languages.recognize_lang[self.INPUT_MIC_VOICE_LANGUAGE] + language=languages.transcription_lang[self.INPUT_MIC_VOICE_LANGUAGE] ) self.mic_transcribe = utils.thread_fnc(self.mic_transcriber.transcribe_audio_queue, args=(self.mic_audio_queue,)) self.mic_transcribe.daemon = True @@ -429,13 +429,13 @@ class App(customtkinter.CTk): self.ENABLE_TRANSCRIPTION_RECEIVE = self.checkbox_transcription_receive.get() if self.ENABLE_TRANSCRIPTION_RECEIVE is True: self.spk_audio_queue = queue.Queue() - spk_device = audio_utils.get_default_output_device() + spk_device = [device for device in audio_utils.get_output_device_list() if device["name"] == self.CHOICE_SPEAKER_DEVICE][0] self.spk_audio_recorder = audio_recorder.SelectedSpeakerRecorder(spk_device) self.spk_audio_recorder.record_into_queue(self.spk_audio_queue) self.spk_transcriber = audio_transcriber.AudioTranscriber( speaker=True, source=self.spk_audio_recorder.source, - language=languages.recognize_lang[self.INPUT_SPEAKER_VOICE_LANGUAGE] + language=languages.transcription_lang[self.INPUT_SPEAKER_VOICE_LANGUAGE] ) self.spk_transcribe = utils.thread_fnc(self.spk_transcriber.transcribe_audio_queue, args=(self.spk_audio_queue,)) self.spk_transcribe.daemon = True diff --git a/window_config.py b/window_config.py index 74674700..87ddaa37 100644 --- a/window_config.py +++ b/window_config.py @@ -136,7 +136,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.optionmenu_translation_input_source_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Translation"), command=self.optionmenu_translation_input_source_language_callback, - values=self.parent.translator.languages[self.parent.CHOICE_TRANSLATOR], + values=list(languages.translation_lang[self.parent.CHOICE_TRANSLATOR].keys()), variable=customtkinter.StringVar(value=self.parent.INPUT_SOURCE_LANG), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), ) @@ -156,7 +156,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.optionmenu_translation_input_target_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Translation"), command=self.optionmenu_translation_input_target_language_callback, - values=self.parent.translator.languages[self.parent.CHOICE_TRANSLATOR], + values=list(languages.translation_lang[self.parent.CHOICE_TRANSLATOR].keys()), variable=customtkinter.StringVar(value=self.parent.INPUT_TARGET_LANG), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), ) @@ -176,7 +176,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.optionmenu_translation_output_source_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Translation"), command=self.optionmenu_translation_output_source_language_callback, - values=self.parent.translator.languages[self.parent.CHOICE_TRANSLATOR], + values=list(languages.translation_lang[self.parent.CHOICE_TRANSLATOR].keys()), variable=customtkinter.StringVar(value=self.parent.OUTPUT_SOURCE_LANG), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), ) @@ -196,7 +196,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.optionmenu_translation_output_target_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Translation"), command=self.optionmenu_translation_output_target_language_callback, - values=self.parent.translator.languages[self.parent.CHOICE_TRANSLATOR], + values=list(languages.translation_lang[self.parent.CHOICE_TRANSLATOR].keys()), variable=customtkinter.StringVar(value=self.parent.OUTPUT_TARGET_LANG), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), ) @@ -232,7 +232,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.label_input_mic_voice_language.grid(row=1, column=0, columnspan=1, padx=5, pady=5, sticky="nsw") self.optionmenu_input_mic_voice_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Transcription"), - values=list(languages.recognize_lang.keys()), + values=list(languages.transcription_lang.keys()), command=self.optionmenu_input_mic_voice_language_callback, variable=customtkinter.StringVar(value=self.parent.INPUT_MIC_VOICE_LANGUAGE), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), @@ -306,7 +306,7 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): self.label_input_speaker_voice_language.grid(row=5, column=0, columnspan=1, padx=5, pady=5, sticky="nsw") self.optionmenu_input_speaker_voice_language = customtkinter.CTkOptionMenu( self.tabview_config.tab("Transcription"), - values=list(languages.recognize_lang.keys()), + values=list(languages.transcription_lang.keys()), command=self.optionmenu_input_speaker_voice_language_callback, variable=customtkinter.StringVar(value=self.parent.INPUT_SPEAKER_VOICE_LANGUAGE), font=customtkinter.CTkFont(family=self.parent.FONT_FAMILY), @@ -500,23 +500,23 @@ class ToplevelWindowConfig(customtkinter.CTkToplevel): utils.print_textbox(self.parent.textbox_message_system_log, "Auth Key or language setting is incorrect", "ERROR") else: self.optionmenu_translation_input_source_language.configure( - values=self.parent.translator.languages[choice], - variable=customtkinter.StringVar(value=self.parent.translator.languages[choice][0])) + values=list(languages.translation_lang[choice].keys()), + variable=customtkinter.StringVar(value=list(languages.translation_lang[choice].keys())[0])) self.optionmenu_translation_input_target_language.configure( - values=self.parent.translator.languages[choice], - variable=customtkinter.StringVar(value=self.parent.translator.languages[choice][1])) + values=list(languages.translation_lang[choice].keys()), + variable=customtkinter.StringVar(value=list(languages.translation_lang[choice].keys())[1])) self.optionmenu_translation_output_source_language.configure( - values=self.parent.translator.languages[choice], - variable=customtkinter.StringVar(value=self.parent.translator.languages[choice][1])) + values=list(languages.translation_lang[choice].keys()), + variable=customtkinter.StringVar(value=list(languages.translation_lang[choice].keys())[1])) self.optionmenu_translation_output_target_language.configure( - values=self.parent.translator.languages[choice], - variable=customtkinter.StringVar(value=self.parent.translator.languages[choice][0])) + values=list(languages.translation_lang[choice].keys()), + variable=customtkinter.StringVar(value=list(languages.translation_lang[choice].keys())[0])) self.parent.CHOICE_TRANSLATOR = choice - self.parent.INPUT_SOURCE_LANG = self.parent.translator.languages[choice][0] - self.parent.INPUT_TARGET_LANG = self.parent.translator.languages[choice][1] - self.parent.OUTPUT_SOURCE_LANG = self.parent.translator.languages[choice][1] - self.parent.OUTPUT_TARGET_LANG = self.parent.translator.languages[choice][0] + self.parent.INPUT_SOURCE_LANG = list(languages.translation_lang[choice].keys())[0] + self.parent.INPUT_TARGET_LANG = list(languages.translation_lang[choice].keys())[1] + self.parent.OUTPUT_SOURCE_LANG = list(languages.translation_lang[choice].keys())[1] + self.parent.OUTPUT_TARGET_LANG = list(languages.translation_lang[choice].keys())[0] utils.save_json(self.parent.PATH_CONFIG, "CHOICE_TRANSLATOR", self.parent.CHOICE_TRANSLATOR) utils.save_json(self.parent.PATH_CONFIG, "INPUT_SOURCE_LANG", self.parent.INPUT_SOURCE_LANG) utils.save_json(self.parent.PATH_CONFIG, "INPUT_TARGET_LANG", self.parent.INPUT_TARGET_LANG)