diff --git a/src-python/config.py b/src-python/config.py index 0629c633..1111bcea 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -1045,7 +1045,7 @@ class Config: "width": 870, "height": 654, } - self._AUTO_MIC_SELECT = False + self._AUTO_MIC_SELECT = True self._SELECTED_MIC_HOST = device_manager.getDefaultMicDevice()["host"]["name"] self._SELECTED_MIC_DEVICE = device_manager.getDefaultMicDevice()["device"]["name"] self._MIC_THRESHOLD = 300 @@ -1056,7 +1056,7 @@ class Config: self._MIC_WORD_FILTER = [] self._MIC_AVG_LOGPROB = -0.8 self._MIC_NO_SPEECH_PROB = 0.6 - self._AUTO_SPEAKER_SELECT = False + self._AUTO_SPEAKER_SELECT = True self._SELECTED_SPEAKER_DEVICE = device_manager.getDefaultSpeakerDevice()["device"]["name"] self._SPEAKER_THRESHOLD = 300 self._SPEAKER_AUTOMATIC_THRESHOLD = False @@ -1107,7 +1107,7 @@ class Config: "display_duration": 5, "fadeout_duration": 2, "opacity": 1.0, - "ui_scaling": 0.5, + "ui_scaling": 1.0, "tracker": "LeftHand", } self._SEND_MESSAGE_TO_VRC = True diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 3c83b626..139663e4 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -144,7 +144,7 @@ class Controller: printLog("CTranslate2 Weight Download Progress", progress) self.run( 200, - self.run_mapping["download_ctranslate2_weight"], + self.run_mapping["download_progress_ctranslate2_weight"], {"weight_type": self.weight_type, "progress": progress}, ) @@ -169,7 +169,7 @@ class Controller: printLog("Whisper Weight Download Progress", progress) self.run( 200, - self.run_mapping["download_whisper_weight"], + self.run_mapping["download_progress_whisper_weight"], {"weight_type": self.weight_type, "progress": progress}, ) @@ -1679,9 +1679,12 @@ class Controller: model.stopWatchdog() return {"status":200, "result":True} + def initializationProgress(self, progress): + self.run(200, self.run_mapping["initialization_progress"], progress) + def init(self, *args, **kwargs) -> None: - removeLog() printLog("Start Initialization") + removeLog() printLog("Start check DeepL API Key") if config.AUTH_KEYS["DeepL_API"] is not None: @@ -1691,6 +1694,8 @@ class Controller: auth_keys["DeepL_API"] = None config.AUTH_KEYS = auth_keys + self.initializationProgress(1) + # download CTranslate2 Model Weight printLog("Download CTranslate2 Model Weight") weight_type = config.CTRANSLATE2_WEIGHT_TYPE @@ -1714,6 +1719,8 @@ class Controller: if isinstance(th_download_whisper, Thread): th_download_whisper.join() + self.initializationProgress(2) + # set Translation Engine printLog("Set Translation Engine") self.updateDownloadedCTranslate2ModelWeight() @@ -1724,6 +1731,8 @@ class Controller: self.updateDownloadedWhisperModelWeight() self.updateTranscriptionEngine() + self.initializationProgress(3) + # set Compute CPU or CUDA printLog("Set Compute CPU or CUDA") self.updateComputeDeviceSettings() @@ -1748,6 +1757,7 @@ class Controller: self.setEnableVrcMicMuteSync() # init Auto device selection + printLog("Init Device Manager") device_manager.setCallbackHostList(self.updateMicHostList) device_manager.setCallbackMicDeviceList(self.updateMicDeviceList) device_manager.setCallbackSpeakerDeviceList(self.updateSpeakerDeviceList) @@ -1755,7 +1765,6 @@ class Controller: printLog("Init Auto Device Selection") if config.AUTO_MIC_SELECT is True: self.setEnableAutoMicSelect() - if config.AUTO_SPEAKER_SELECT is True: self.setEnableAutoSpeakerSelect() @@ -1763,8 +1772,10 @@ class Controller: if (config.OVERLAY_SMALL_LOG is True or config.OVERLAY_LARGE_LOG is True): model.startOverlay() + self.initializationProgress(4) + + printLog("Update settings") self.updateConfigSettings() printLog("End Initialization") - self.startWatchdog() \ No newline at end of file diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 994ad941..2ad86c02 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -20,9 +20,9 @@ run_mapping = { "error_translation_engine":"/run/error_translation_engine", "word_filter":"/run/word_filter", - "download_ctranslate2_weight":"/run/download_ctranslate2_weight", + "download_progress_ctranslate2_weight":"/run/download_progress_ctranslate2_weight", "downloaded_ctranslate2_weight":"/run/downloaded_ctranslate2_weight", - "download_whisper_weight":"/run/download_whisper_weight", + "download_progress_whisper_weight":"/run/download_progress_whisper_weight", "downloaded_whisper_weight":"/run/downloaded_whisper_weight", "selected_mic_device":"/run/selected_mic_device", @@ -37,6 +37,7 @@ run_mapping = { "update_software_flag":"/run/update_software_flag", + "initialization_progress":"/run/initialization_progress", "initialization_complete":"/run/initialization_complete", }