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

Bugfix/audioservice invalid utterance

mycroft/skills/audioservice.py

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

mycroft/skills/common_play_skill.py

@@ -122,7 +122,8 @@ class CommonPlaySkill(MycroftSkill, ABC):
         """
         # 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"
-        kwargs['utterance'] = self.play_service_string
+        if 'utterance' not in kwargs:
+            kwargs['utterance'] = self.play_service_string
         self.audioservice.play(*args, **kwargs)
 
     def stop(self):