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

Merge branch 'bugfix_energy_ProgressBar' into UI_2.0

Browse Source
This commit is contained in:
misyaguziya
2023-09-05 22:38:39 +09:00
parent dc440d53b6 bfed9a2d26
commit 80bb888775
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
model.py
View File

@@ -250,6 +250,7 @@ class Model:
energy = mic_energy_queue.get() energy = mic_energy_queue.get()
fnc(energy) fnc(energy)
sleep(0.01) sleep(0.01)
mic_energy_queue = Queue() mic_energy_queue = Queue()
mic_device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0] mic_device = [device for device in getInputDevices()[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)
@@ -303,24 +304,17 @@ class Model:
fnc(energy) fnc(energy)
sleep(0.01) sleep(0.01)
def getSpeakerEnergy():
with self.speaker_energy_recorder.source as source:
energy = self.speaker_energy_recorder.recorder.listen_energy(source)
speaker_energy_queue.put(energy)
speaker_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0] speaker_device = [device for device in getOutputDevices() 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 = threadFnc(getSpeakerEnergy) self.speaker_energy_recorder.recordIntoQueue(speaker_energy_queue)
self.speaker_energy_get_progressbar.daemon = True
self.speaker_energy_get_progressbar.start()
self.speaker_energy_plot_progressbar = threadFnc(sendSpeakerEnergy) self.speaker_energy_plot_progressbar = threadFnc(sendSpeakerEnergy)
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()
def stopCheckSpeakerEnergy(self): def stopCheckSpeakerEnergy(self):
if self.speaker_energy_get_progressbar != None: if self.speaker_energy_recorder != None:
self.speaker_energy_get_progressbar.stop() self.speaker_energy_recorder.stop()
if self.speaker_energy_plot_progressbar != None: if self.speaker_energy_plot_progressbar != None:
self.speaker_energy_plot_progressbar.stop() self.speaker_energy_plot_progressbar.stop()

2
models/transcription/transcription_recorder.py
View File

@@ -84,8 +84,6 @@ class SelectedSpeakeEnergyRecorder(BaseEnergyRecorder):
source = Microphone(speaker=True, source = Microphone(speaker=True,
device_index= device["index"], device_index= device["index"],
sample_rate=int(device["defaultSampleRate"]), sample_rate=int(device["defaultSampleRate"]),
chunk_size=get_sample_size(paInt16),
channels=device["maxInputChannels"]
) )
super().__init__(source=source) super().__init__(source=source)
# self.adjustForNoise() # self.adjustForNoise()