Merge branch 'master' into feature/deb-packaging
commit
b127291b43
|
@ -30,6 +30,7 @@ from mycroft.messagebus.client.ws import WebsocketClient
|
|||
from mycroft.messagebus.message import Message
|
||||
from mycroft.util import kill
|
||||
from mycroft.util.log import getLogger
|
||||
from mycroft.skills.volume import VolumeSkill
|
||||
|
||||
__author__ = 'aatchison + jdorleans'
|
||||
|
||||
|
@ -74,6 +75,12 @@ class EnclosureReader(Thread):
|
|||
self.client.emit(Message("mycroft.stop"))
|
||||
kill(['mimic']) # TODO - Refactoring in favor of Mycroft Stop
|
||||
|
||||
if "volume.up" in data:
|
||||
self.client.emit(Message("IncreaseVolumeIntent"))
|
||||
|
||||
if "volume.down" in data:
|
||||
self.client.emit(Message("DecreaseVolumeIntent"))
|
||||
|
||||
def stop(self):
|
||||
self.alive = False
|
||||
self.join()
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.1.2
|
||||
0.1.3
|
|
@ -139,7 +139,7 @@ class AudioRecordSkill(ScheduledSkill):
|
|||
def handle_stop_play(self, message):
|
||||
self.speak_dialog('audio.record.stop.play')
|
||||
if self.play_process:
|
||||
self.stop(self.play_process)
|
||||
self.stop()
|
||||
self.play_process = None
|
||||
|
||||
def stop(self):
|
||||
|
|
Loading…
Reference in New Issue