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

Merge branch 'model' into UI_2.0

Browse Source
This commit is contained in:
misyaguziya
2023-09-17 07:41:53 +09:00
parent 5fc4f04adc e84764dcd9
commit f6071edd75
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main.py
View File

@@ -1,3 +1,4 @@
from time import sleep
from threading import Thread from threading import Thread
from config import config from config import config
from model import model from model import model
@@ -242,18 +243,19 @@ def callbackOpenConfigWindow():
view.foregroundOff() view.foregroundOff()
def callbackCloseConfigWindow(): def callbackCloseConfigWindow():
if config.ENABLE_TRANSCRIPTION_SEND is True:
startThreadingTranscriptionSendMessage()
if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
startThreadingTranscriptionReceiveMessage()
model.stopCheckMicEnergy() model.stopCheckMicEnergy()
model.stopCheckSpeakerEnergy()
view.replaceMicThresholdCheckButton_Passive() view.replaceMicThresholdCheckButton_Passive()
# view.initProgressBar_MicEnergy() # ProgressBarに0をセットしたい # view.initProgressBar_MicEnergy() # ProgressBarに0をセットしたい
model.stopCheckSpeakerEnergy()
view.replaceSpeakerThresholdCheckButton_Passive() view.replaceSpeakerThresholdCheckButton_Passive()
# view.initProgressBar_SpeakerEnergy() # ProgressBarに0をセットしたい # view.initProgressBar_SpeakerEnergy() # ProgressBarに0をセットしたい
if config.ENABLE_TRANSCRIPTION_SEND is True:
startThreadingTranscriptionSendMessage()
if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
sleep(2)
if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
startThreadingTranscriptionReceiveMessage()
if config.ENABLE_FOREGROUND is True: if config.ENABLE_FOREGROUND is True:
view.foregroundOn() view.foregroundOn()

10
model.py
View File

@@ -281,10 +281,11 @@ class Model:
self.mic_energy_plot_progressbar.start() self.mic_energy_plot_progressbar.start()
def stopCheckMicEnergy(self): def stopCheckMicEnergy(self):
if isinstance(self.mic_energy_plot_progressbar, threadFnc):
self.mic_energy_plot_progressbar.stop()
if self.mic_energy_recorder != None: if self.mic_energy_recorder != None:
self.mic_energy_recorder.stop() self.mic_energy_recorder.stop()
if self.mic_energy_plot_progressbar != None: self.mic_energy_recorder.stop = None
self.mic_energy_plot_progressbar.stop()
def startSpeakerTranscript(self, fnc): def startSpeakerTranscript(self, fnc):
spk_audio_queue = Queue() spk_audio_queue = Queue()
@@ -346,10 +347,11 @@ class Model:
self.speaker_energy_plot_progressbar.start() self.speaker_energy_plot_progressbar.start()
def stopCheckSpeakerEnergy(self): def stopCheckSpeakerEnergy(self):
if isinstance(self.speaker_energy_plot_progressbar, threadFnc):
self.speaker_energy_plot_progressbar.stop()
if self.speaker_energy_recorder != None: if self.speaker_energy_recorder != None:
self.speaker_energy_recorder.stop() self.speaker_energy_recorder.stop()
if self.speaker_energy_plot_progressbar != None: self.speaker_energy_recorder.stop != None
self.speaker_energy_plot_progressbar.stop()
def notificationXSOverlay(self, message): def notificationXSOverlay(self, message):
xsoverlayForVRCT(content=f"{message}") xsoverlayForVRCT(content=f"{message}")