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

👍️[Update] Model : Overlayの起動タイミングを修正

Browse Source
This commit is contained in:
misyaguziya
2024-11-16 10:19:38 +09:00
parent 59f544396c
commit 2e54648ee6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-python/models/overlay/overlay.py
View File

@@ -71,6 +71,7 @@ class Overlay:
self.system = None self.system = None
self.overlay = None self.overlay = None
self.handle = None self.handle = None
self.init_process = False
self.initialized = False self.initialized = False
self.loop = True self.loop = True
self.thread_overlay = None self.thread_overlay = None
@@ -109,6 +110,7 @@ class Overlay:
size size
) )
self.initialized = True self.initialized = True
self.init_process = False
except Exception as e: except Exception as e:
printLog("error:Could not initialise OpenVR", e) printLog("error:Could not initialise OpenVR", e)
@@ -243,12 +245,15 @@ class Overlay:
time.sleep(sleepTime) time.sleep(sleepTime)
def main(self): def main(self):
while self.checkSteamvrRunning() is False:
time.sleep(10)
self.init() self.init()
if self.initialized is True: if self.initialized is True:
self.mainloop() self.mainloop()
def startOverlay(self): def startOverlay(self):
if self.checkSteamvrRunning() and self.initialized is False: if self.initialized is False and self.init_process is False:
self.init_process = True
self.thread_overlay = Thread(target=self.main) self.thread_overlay = Thread(target=self.main)
self.thread_overlay.daemon = True self.thread_overlay.daemon = True
self.thread_overlay.start() self.thread_overlay.start()

8
src-python/webui_controller.py
View File

@@ -1354,8 +1354,6 @@ class Controller:
def setEnableTranscriptionSend(self, *args, **kwargs) -> dict: def setEnableTranscriptionSend(self, *args, **kwargs) -> dict:
self.startThreadingTranscriptionSendMessage() self.startThreadingTranscriptionSendMessage()
config.ENABLE_TRANSCRIPTION_SEND = True config.ENABLE_TRANSCRIPTION_SEND = True
if config.OVERLAY_LARGE_LOG is True:
model.startOverlay()
return {"status":200, "result":config.ENABLE_TRANSCRIPTION_SEND} return {"status":200, "result":config.ENABLE_TRANSCRIPTION_SEND}
def setDisableTranscriptionSend(self, *args, **kwargs) -> dict: def setDisableTranscriptionSend(self, *args, **kwargs) -> dict:
@@ -1365,8 +1363,6 @@ class Controller:
def setEnableTranscriptionReceive(self, *args, **kwargs) -> dict: def setEnableTranscriptionReceive(self, *args, **kwargs) -> dict:
self.startThreadingTranscriptionReceiveMessage() self.startThreadingTranscriptionReceiveMessage()
if (config.OVERLAY_SMALL_LOG is True or config.OVERLAY_LARGE_LOG is True):
model.startOverlay()
config.ENABLE_TRANSCRIPTION_RECEIVE = True config.ENABLE_TRANSCRIPTION_RECEIVE = True
return {"status":200, "result":config.ENABLE_TRANSCRIPTION_RECEIVE} return {"status":200, "result":config.ENABLE_TRANSCRIPTION_RECEIVE}
@@ -1763,6 +1759,10 @@ class Controller:
if config.AUTO_SPEAKER_SELECT is True: if config.AUTO_SPEAKER_SELECT is True:
self.setEnableAutoSpeakerSelect() self.setEnableAutoSpeakerSelect()
printLog("Init Overlay")
if (config.OVERLAY_SMALL_LOG is True or config.OVERLAY_LARGE_LOG is True):
model.startOverlay()
self.updateConfigSettings() self.updateConfigSettings()
printLog("End Initialization") printLog("End Initialization")