MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prevent audio playing between mic record and handling

pull/2621/head
Kris Gesling 2020-06-19 15:27:48 +09:30
parent 819ea94d2e
commit 4345011f7f
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mycroft/audio/audioservice.py
View File

@ -190,7 +190,8 @@ class AudioService:
self.bus.on('recognizer_loop:audio_output_start', self._lower_volume) self.bus.on('recognizer_loop:audio_output_start', self._lower_volume)
self.bus.on('recognizer_loop:record_begin', self._lower_volume) self.bus.on('recognizer_loop:record_begin', self._lower_volume)
self.bus.on('recognizer_loop:audio_output_end', self._restore_volume) self.bus.on('recognizer_loop:audio_output_end', self._restore_volume)
self.bus.on('recognizer_loop:record_end', self._restore_volume) self.bus.on('recognizer_loop:record_end',
self._restore_volume_after_record)
def track_start(self, track): def track_start(self, track):
"""Callback method called from the services to indicate start of """Callback method called from the services to indicate start of
@ -294,6 +295,27 @@ class AudioService:
if not self.volume_is_low: if not self.volume_is_low:
self.current.restore_volume() self.current.restore_volume()
def _restore_volume_after_record(self, message=None):
"""
Restores the volume when Mycroft is done recording.
If no utterance detected, restores immediately.
Else keeps volume low until Mycroft responds to the utterance.
Args:
message: message bus message, not used but required
"""
def __restore_volume():
LOG.debug('restoring volume')
self.volume_is_low = False
if not self.volume_is_low:
self.current.restore_volume()
self.bus.remove('recognizer_loop:speech.recognition.unknown',
__restore_volume)
if self.current:
self.bus.on('recognizer_loop:speech.recognition.unknown',
__restore_volume)
def play(self, tracks, prefered_service, repeat=False): def play(self, tracks, prefered_service, repeat=False):
""" """
play starts playing the audio on the prefered service if it play starts playing the audio on the prefered service if it
@ -440,4 +462,5 @@ class AudioService:
self.bus.remove('recognizer_loop:record_begin', self._lower_volume) self.bus.remove('recognizer_loop:record_begin', self._lower_volume)
self.bus.remove('recognizer_loop:audio_output_end', self.bus.remove('recognizer_loop:audio_output_end',
self._restore_volume) self._restore_volume)
self.bus.remove('recognizer_loop:record_end', self._restore_volume) self.bus.remove('recognizer_loop:record_end',
self._restore_volume_after_record)