From 8ad51a758b6201b1785a05ba356d1c26284c84dd Mon Sep 17 00:00:00 2001
From: aatchison <arron.atchison@gmail.com>
Date: Fri, 17 Jun 2016 14:48:04 -0500
Subject: [PATCH 1/4] removed '.' from mimic voice path
---
mycroft/configuration/mycroft.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mycroft/configuration/mycroft.ini b/mycroft/configuration/mycroft.ini
index 9e248dd495..3e2474b9b3 100644
--- a/mycroft/configuration/mycroft.ini
+++ b/mycroft/configuration/mycroft.ini
@@ -50,7 +50,7 @@ session_ttl_seconds = 180
[tts]
module = "mimic"
-mimic.voice = "./mycroft/tts/mycroft_voice_4.0.flitevox"
+mimic.voice = "/mycroft/tts/mycroft_voice_4.0.flitevox"
espeak.lang = "english-us"
espeak.voice = "m1"
From 0eda59dd9e9513cd59beca5f51f59e6334252cb3 Mon Sep 17 00:00:00 2001
From: Arron Atchison <arron.atchison@gmail.com>
Date: Fri, 17 Jun 2016 15:06:31 -0500
Subject: [PATCH 2/4] ok, this works, but not for packaging
I have another approach to try.
---
mycroft/configuration/mycroft.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mycroft/configuration/mycroft.ini b/mycroft/configuration/mycroft.ini
index 3e2474b9b3..9979ce1260 100644
--- a/mycroft/configuration/mycroft.ini
+++ b/mycroft/configuration/mycroft.ini
@@ -50,7 +50,7 @@ session_ttl_seconds = 180
[tts]
module = "mimic"
-mimic.voice = "/mycroft/tts/mycroft_voice_4.0.flitevox"
+mimic.voice = "mycroft/tts/mycroft_voice_4.0.flitevox"
espeak.lang = "english-us"
espeak.voice = "m1"
From 3870e3c9c786244b64f3d7d9c3fbba9ac7e08b3f Mon Sep 17 00:00:00 2001
From: isaacnward <isaacnward@gmail.com>
Date: Fri, 17 Jun 2016 16:27:09 -0500
Subject: [PATCH 3/4] Features/encoder volume (#157)
* added volume control in enclosure.py
* fixed syntax for skill method usage
* addressing a problem with the enclosure service
* trying to use intents
* oops
* fixed pep8
* fixed issue with reversed volume controls
* changed enclosure version number to reflect updated enclosure code
---
mycroft/client/enclosure/enclosure.py | 7 +++++++
mycroft/client/enclosure/version.txt | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/mycroft/client/enclosure/enclosure.py b/mycroft/client/enclosure/enclosure.py
index 765b4c87e5..de27359c76 100644
--- a/mycroft/client/enclosure/enclosure.py
+++ b/mycroft/client/enclosure/enclosure.py
@@ -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()
diff --git a/mycroft/client/enclosure/version.txt b/mycroft/client/enclosure/version.txt
index 8294c18436..7693c96bff 100644
--- a/mycroft/client/enclosure/version.txt
+++ b/mycroft/client/enclosure/version.txt
@@ -1 +1 @@
-0.1.2
\ No newline at end of file
+0.1.3
\ No newline at end of file
From e0104993027606eaf885355c3aa73a441532c9c0 Mon Sep 17 00:00:00 2001
From: Jonathan D'Orleans <jonathan.dorleans@mycroft.ai>
Date: Fri, 17 Jun 2016 19:06:06 -0400
Subject: [PATCH 4/4] Audio Record Skill - Remove unexpected arg during stop()
call
---
mycroft/skills/audio_record/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mycroft/skills/audio_record/__init__.py b/mycroft/skills/audio_record/__init__.py
index 9cd219c0de..bce869101a 100644
--- a/mycroft/skills/audio_record/__init__.py
+++ b/mycroft/skills/audio_record/__init__.py
@@ -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):