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

[Update] change osc_tools.py func name

Browse Source
This commit is contained in:
misygauziya
2023-08-20 01:33:43 +09:00
parent 02d8fbdb1c
commit 1470187c02
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
model.py
View File

@@ -5,17 +5,17 @@ from requests import get as requests_get
from flashtext import KeywordProcessor from flashtext import KeywordProcessor
from models.translation.translation_translator import Translator from models.translation.translation_translator import Translator
from models.osc.osc_tools import send_typing, send_message, send_test_action, receive_osc_parameters
from models.transcription.transcription_utils import get_input_device_list, get_output_device_list, get_default_input_device, get_default_output_device from models.transcription.transcription_utils import get_input_device_list, get_output_device_list, get_default_input_device, get_default_output_device
from models.osc.osc_tools import sendTyping, sendMessage, sendTestAction, receiveOscParameters
from models.transcription.transcription_recorder import SelectedMicRecorder, SelectedSpeakerRecorder from models.transcription.transcription_recorder import SelectedMicRecorder, SelectedSpeakerRecorder
from models.transcription.transcription_recorder import SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder from models.transcription.transcription_recorder import SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder
from models.transcription.transcription_transcriber import AudioTranscriber from models.transcription.transcription_transcriber import AudioTranscriber
from models.xsoverlay.notification import notification_xsoverlay_for_vrct from models.xsoverlay.notification import notification_xsoverlay_for_vrct
from config import config from config import config
class thread_fnc(Thread): class threadFnc(Thread):
def __init__(self, fnc, daemon=True, *args, **kwargs): def __init__(self, fnc, daemon=True, *args, **kwargs):
super(thread_fnc, self).__init__(daemon=daemon, *args, **kwargs) super(threadFnc, self).__init__(daemon=daemon, *args, **kwargs)
self.fnc = fnc self.fnc = fnc
self._stop = Event() self._stop = Event()
def stop(self): def stop(self):
@@ -101,15 +101,15 @@ class Model:
@staticmethod @staticmethod
def oscStartSendTyping(): def oscStartSendTyping():
send_typing(True, config.OSC_IP_ADDRESS, config.OSC_PORT) sendTyping(True, config.OSC_IP_ADDRESS, config.OSC_PORT)
@staticmethod @staticmethod
def oscStopSendTyping(): def oscStopSendTyping():
send_typing(False, config.OSC_IP_ADDRESS, config.OSC_PORT) sendTyping(False, config.OSC_IP_ADDRESS, config.OSC_PORT)
@staticmethod @staticmethod
def oscSendMessage(message): def oscSendMessage(message):
send_message(message, config.OSC_IP_ADDRESS, config.OSC_PORT) sendMessage(message, config.OSC_IP_ADDRESS, config.OSC_PORT)
@staticmethod @staticmethod
def oscCheck(): def oscCheck():
@@ -118,12 +118,12 @@ class Model:
config.ENABLE_OSC = True config.ENABLE_OSC = True
# start receive osc # start receive osc
th_receive_osc_parameters = Thread(target=receive_osc_parameters, args=(check_osc_receive,)) th_receive_osc_parameters = Thread(target=receiveOscParameters, args=(check_osc_receive,))
th_receive_osc_parameters.daemon = True th_receive_osc_parameters.daemon = True
th_receive_osc_parameters.start() th_receive_osc_parameters.start()
# check osc started # check osc started
send_test_action() sendTestAction()
# check update # check update
response = requests_get(config.GITHUB_URL) response = requests_get(config.GITHUB_URL)
@@ -174,12 +174,12 @@ class Model:
message = mic_transcriber.get_transcript() message = mic_transcriber.get_transcript()
fnc(message) fnc(message)
self.mic_print_transcript = thread_fnc(mic_transcript_to_chatbox) self.mic_print_transcript = threadFnc(mic_transcript_to_chatbox)
self.mic_print_transcript.daemon = True self.mic_print_transcript.daemon = True
self.mic_print_transcript.start() self.mic_print_transcript.start()
def stopMicTranscript(self): def stopMicTranscript(self):
if isinstance(self.mic_print_transcript, thread_fnc): if isinstance(self.mic_print_transcript, threadFnc):
self.mic_print_transcript.stop() self.mic_print_transcript.stop()
if self.mic_audio_recorder.stop != None: if self.mic_audio_recorder.stop != None:
self.mic_audio_recorder.stop() self.mic_audio_recorder.stop()
@@ -195,7 +195,7 @@ class Model:
mic_device = [device for device in get_input_device_list()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0] mic_device = [device for device in get_input_device_list()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0]
self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device) self.mic_energy_recorder = SelectedMicEnergyRecorder(mic_device)
self.mic_energy_recorder.record_into_queue(mic_energy_queue) self.mic_energy_recorder.record_into_queue(mic_energy_queue)
self.mic_energy_plot_progressbar = thread_fnc(progressBarInputMicEnergyPlot) self.mic_energy_plot_progressbar = threadFnc(progressBarInputMicEnergyPlot)
self.mic_energy_plot_progressbar.daemon = True self.mic_energy_plot_progressbar.daemon = True
self.mic_energy_plot_progressbar.start() self.mic_energy_plot_progressbar.start()
@@ -226,12 +226,12 @@ class Model:
message = spk_transcriber.get_transcript() message = spk_transcriber.get_transcript()
fnc(message) fnc(message)
self.spk_print_transcript = thread_fnc(spk_transcript_to_textbox) self.spk_print_transcript = threadFnc(spk_transcript_to_textbox)
self.spk_print_transcript.daemon = True self.spk_print_transcript.daemon = True
self.spk_print_transcript.start() self.spk_print_transcript.start()
def stopSpeakerTranscript(self): def stopSpeakerTranscript(self):
if isinstance(self.spk_print_transcript, thread_fnc): if isinstance(self.spk_print_transcript, threadFnc):
self.spk_print_transcript.stop() self.spk_print_transcript.stop()
if self.spk_audio_recorder.stop != None: if self.spk_audio_recorder.stop != None:
self.spk_audio_recorder.stop() self.spk_audio_recorder.stop()
@@ -252,10 +252,10 @@ class Model:
speaker_device = [device for device in get_output_device_list() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0] speaker_device = [device for device in get_output_device_list() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0]
speaker_energy_queue = Queue() speaker_energy_queue = Queue()
self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device) self.speaker_energy_recorder = SelectedSpeakeEnergyRecorder(speaker_device)
self.speaker_energy_get_progressbar = thread_fnc(progressBar_input_speaker_energy_get) self.speaker_energy_get_progressbar = threadFnc(progressBar_input_speaker_energy_get)
self.speaker_energy_get_progressbar.daemon = True self.speaker_energy_get_progressbar.daemon = True
self.speaker_energy_get_progressbar.start() self.speaker_energy_get_progressbar.start()
self.speaker_energy_plot_progressbar = thread_fnc(progressBar_input_speaker_energy_plot) self.speaker_energy_plot_progressbar = threadFnc(progressBar_input_speaker_energy_plot)
self.speaker_energy_plot_progressbar.daemon = True self.speaker_energy_plot_progressbar.daemon = True
self.speaker_energy_plot_progressbar.start() self.speaker_energy_plot_progressbar.start()

8
models/osc/osc_tools.py
View File

@@ -6,7 +6,7 @@ from pythonosc import dispatcher
from pythonosc import osc_server from pythonosc import osc_server
# send OSC message typing # send OSC message typing
def send_typing(flag=False, ip_address="127.0.0.1", port=9000): def sendTyping(flag=False, ip_address="127.0.0.1", port=9000):
typing = osc_message_builder.OscMessageBuilder(address="/chatbox/typing") typing = osc_message_builder.OscMessageBuilder(address="/chatbox/typing")
typing.add_arg(flag) typing.add_arg(flag)
b_typing = typing.build() b_typing = typing.build()
@@ -14,7 +14,7 @@ def send_typing(flag=False, ip_address="127.0.0.1", port=9000):
client.send(b_typing) client.send(b_typing)
# send OSC message # send OSC message
def send_message(message=None, ip_address="127.0.0.1", port=9000): def sendMessage(message=None, ip_address="127.0.0.1", port=9000):
if message != None: if message != None:
msg = osc_message_builder.OscMessageBuilder(address="/chatbox/input") msg = osc_message_builder.OscMessageBuilder(address="/chatbox/input")
msg.add_arg(f"{message}") msg.add_arg(f"{message}")
@@ -24,13 +24,13 @@ def send_message(message=None, ip_address="127.0.0.1", port=9000):
client = udp_client.SimpleUDPClient(ip_address, port) client = udp_client.SimpleUDPClient(ip_address, port)
client.send(b_msg) client.send(b_msg)
def send_test_action(ip_address="127.0.0.1", port=9000): def sendTestAction(ip_address="127.0.0.1", port=9000):
client = udp_client.SimpleUDPClient(ip_address, port) client = udp_client.SimpleUDPClient(ip_address, port)
client.send_message("/input/Vertical", 1) client.send_message("/input/Vertical", 1)
sleep(0.01) sleep(0.01)
client.send_message("/input/Vertical", False) client.send_message("/input/Vertical", False)
def receive_osc_parameters(target, filter="/*", ip_address="127.0.0.1", port=9001): def receiveOscParameters(target, filter="/*", ip_address="127.0.0.1", port=9001):
_dispatcher = dispatcher.Dispatcher() _dispatcher = dispatcher.Dispatcher()
_dispatcher.map(filter, target) _dispatcher.map(filter, target)
server = osc_server.ThreadingOSCUDPServer((ip_address, port), _dispatcher) server = osc_server.ThreadingOSCUDPServer((ip_address, port), _dispatcher)