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 #1871 from forslund/bugfix/audioservice-stop 

Bugfix CPS Starting audio
pull/1883/head
Michael Nguyen 2018-11-19 14:54:54 -06:00 committed by GitHub
parent 70cb8251d7 8859ff1d3b
commit e19062cccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mycroft/audio/audioservice.py
View File

@ -143,6 +143,7 @@ class AudioService(object):
self.default = None
self.service = []
self.current = None
self.play_start_time = 0
self.volume_is_low = False
self.pulse = None
self.pulse_quiet = None
@ -249,15 +250,16 @@ class AudioService(object):
Args:
message: message bus message, not used but required
"""
LOG.debug('stopping all playing services')
with self.service_lock:
if self.current:
name = self.current.name
if self.current.stop():
self.bus.emit(Message("mycroft.stop.handled",
{"by": "audio:" + name}))
if time.monotonic() - self.play_start_time > 1:
LOG.debug('stopping all playing services')
with self.service_lock:
if self.current:
name = self.current.name
if self.current.stop():
self.bus.emit(Message("mycroft.stop.handled",
{"by": "audio:" + name}))
self.current = None
self.current = None
def _lower_volume(self, message=None):
"""
@ -374,6 +376,7 @@ class AudioService(object):
selected_service.add_list(tracks)
selected_service.play(repeat)
self.current = selected_service
self.play_start_time = time.monotonic()
def _queue(self, message):
if self.current: