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

Merge pull request #1857 from forslund/bugfix/audioservice-invalid-utterance 

Bugfix/audioservice invalid utterance
pull/1859/head
Åke 2018-10-23 23:11:30 +02:00 committed by GitHub
parent 1a7cb0a177 b1f2ff27a0
commit 84694bec67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mycroft/skills/audioservice.py
View File

@ -77,7 +77,7 @@ class AudioService(object):
self.bus.emit(Message('mycroft.audio.service.queue', self.bus.emit(Message('mycroft.audio.service.queue',
data={'tracks': tracks})) data={'tracks': tracks}))
def play(self, tracks=None, utterance='', repeat=None): def play(self, tracks=None, utterance=None, repeat=None):
""" Start playback. """ Start playback.
Args: Args:
@ -90,6 +90,7 @@ class AudioService(object):
""" """
repeat = repeat or False repeat = repeat or False
tracks = tracks or [] tracks = tracks or []
utterance = utterance or ''
if isinstance(tracks, (str, tuple)): if isinstance(tracks, (str, tuple)):
tracks = [tracks] tracks = [tracks]
elif not isinstance(tracks, list): elif not isinstance(tracks, list):

3
mycroft/skills/common_play_skill.py
View File

@ -122,7 +122,8 @@ class CommonPlaySkill(MycroftSkill, ABC):
""" """
# Inject the user's utterance in case the audio backend wants to # Inject the user's utterance in case the audio backend wants to
# interpret it. E.g. "play some rock at full volume on the stereo" # interpret it. E.g. "play some rock at full volume on the stereo"
kwargs['utterance'] = self.play_service_string if 'utterance' not in kwargs:
kwargs['utterance'] = self.play_service_string
self.audioservice.play(*args, **kwargs) self.audioservice.play(*args, **kwargs)
def stop(self): def stop(self):