every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

👍️[Update] DeviceManager : テスト用の不要なprintLogを削除

Browse Source
This commit is contained in:
misyaguziya
2024-10-04 13:28:45 +09:00
parent b3d8750975
commit 4f509d06db
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-python/model.py
View File

@@ -32,8 +32,6 @@ from models.transcription.transcription_whisper import checkWhisperWeight, downl
from models.overlay.overlay import Overlay from models.overlay.overlay import Overlay
from models.overlay.overlay_image import OverlayImage from models.overlay.overlay_image import OverlayImage
import utils
class threadFnc(Thread): class threadFnc(Thread):
def __init__(self, fnc, end_fnc=None, daemon=True, *args, **kwargs): def __init__(self, fnc, end_fnc=None, daemon=True, *args, **kwargs):
super(threadFnc, self).__init__(daemon=daemon, target=fnc, *args, **kwargs) super(threadFnc, self).__init__(daemon=daemon, target=fnc, *args, **kwargs)
@@ -665,16 +663,12 @@ class Model:
def stopSpeakerTranscript(self): def stopSpeakerTranscript(self):
if isinstance(self.speaker_print_transcript, threadFnc): if isinstance(self.speaker_print_transcript, threadFnc):
utils.printLog("stop speaker_print_transcript")
self.speaker_print_transcript.stop() self.speaker_print_transcript.stop()
self.speaker_print_transcript.join() self.speaker_print_transcript.join()
self.speaker_print_transcript = None self.speaker_print_transcript = None
utils.printLog("stopped speaker_audio_recorder")
if isinstance(self.speaker_audio_recorder, SelectedSpeakerEnergyAndAudioRecorder): if isinstance(self.speaker_audio_recorder, SelectedSpeakerEnergyAndAudioRecorder):
utils.printLog("stop speaker_audio_recorder")
self.speaker_audio_recorder.stop() self.speaker_audio_recorder.stop()
self.speaker_audio_recorder = None self.speaker_audio_recorder = None
utils.printLog("stopped speaker_audio_recorder")
# if isinstance(self.speaker_get_energy, threadFnc): # if isinstance(self.speaker_get_energy, threadFnc):
# self.speaker_get_energy.stop() # self.speaker_get_energy.stop()
# self.speaker_get_energy = None # self.speaker_get_energy = None
@@ -708,17 +702,13 @@ class Model:
def stopCheckSpeakerEnergy(self): def stopCheckSpeakerEnergy(self):
if isinstance(self.speaker_energy_plot_progressbar, threadFnc): if isinstance(self.speaker_energy_plot_progressbar, threadFnc):
utils.printLog("stop speaker_energy_plot_progressbar")
self.speaker_energy_plot_progressbar.stop() self.speaker_energy_plot_progressbar.stop()
self.speaker_energy_plot_progressbar.join() self.speaker_energy_plot_progressbar.join()
self.speaker_energy_plot_progressbar = None self.speaker_energy_plot_progressbar = None
utils.printLog("stopped speaker_energy_plot_progressbar")
if isinstance(self.speaker_energy_recorder, SelectedSpeakerEnergyRecorder): if isinstance(self.speaker_energy_recorder, SelectedSpeakerEnergyRecorder):
utils.printLog("stopped speaker_energy_recorder")
self.speaker_energy_recorder.resume() self.speaker_energy_recorder.resume()
self.speaker_energy_recorder.stop() self.speaker_energy_recorder.stop()
self.speaker_energy_recorder = None self.speaker_energy_recorder = None
utils.printLog("stopped speaker_energy_recorder")
def createOverlayImageShort(self, message, translation): def createOverlayImageShort(self, message, translation):
your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]

4
src-python/webui_controller.py
View File

@@ -58,18 +58,14 @@ class Controller:
def restartAccessDevices(self) -> None: def restartAccessDevices(self) -> None:
if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_TRANSCRIPTION_SEND is True:
printLog("Restart Access Devices", "Start Mic Transcript")
self.startThreadingTranscriptionSendMessage() self.startThreadingTranscriptionSendMessage()
if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
printLog("Restart Access Devices", "Start Speaker Transcript")
self.startThreadingTranscriptionReceiveMessage() self.startThreadingTranscriptionReceiveMessage()
if config.ENABLE_CHECK_ENERGY_SEND is True: if config.ENABLE_CHECK_ENERGY_SEND is True:
printLog("Restart Access Devices", "Start Check Mic Energy")
model.startCheckMicEnergy( model.startCheckMicEnergy(
self.progressBarMicEnergy, self.progressBarMicEnergy,
) )
if config.ENABLE_CHECK_ENERGY_RECEIVE is True: if config.ENABLE_CHECK_ENERGY_RECEIVE is True:
printLog("Restart Access Devices", "Start Check Speaker Energy")
model.startCheckSpeakerEnergy( model.startCheckSpeakerEnergy(
self.progressBarSpeakerEnergy, self.progressBarSpeakerEnergy,
) )