Merge pull request #155 from Holzhaus/new-speakers

Cleanup client.speaker and add additional tts speakers

Author: Holzhaus

client/musicmode.py

@@ -7,7 +7,6 @@
 from mic import Mic
 import g2p
 from music import *
-import speaker
 import stt
 
 
@@ -42,7 +41,7 @@ def __init__(self, PERSONA, mic):
 
         # create a new mic with the new music models
         self.mic = Mic(
-            speaker.newSpeaker(),
+            mic.speaker,
             stt.PocketSphinxSTT(lmd_music="languagemodel_spotify.lm", dictd_music="dictionary_spotify.dic"),
             stt.PocketSphinxSTT(lmd_music="languagemodel_spotify.lm", dictd_music="dictionary_spotify.dic")
         )

client/speaker.py

@@ -12,6 +12,7 @@
 import g2p
 import brain
 import jasperpath
+import tts
 from diagnose import Diagnostics
 
 DEFAULT_PROFILE = {
@@ -189,6 +190,11 @@ def testWeather(self):
             "can't see that far ahead" in outputs[0]
             or "Tomorrow" in outputs[0])
 
+class TestTTS(unittest.TestCase):
+    def testTTS(self):
+        tts_engine = tts.get_engine_by_slug('dummy-tts')
+        tts_instance = tts_engine()
+        tts_instance.say('This is a test.')
 
 class TestBrain(unittest.TestCase):
 
@@ -236,7 +242,7 @@ def testPriority(self):
     # Change CWD to jasperpath.LIB_PATH
     os.chdir(jasperpath.LIB_PATH)
 
-    test_cases = [TestBrain, TestModules, TestVocabCompiler]
+    test_cases = [TestBrain, TestModules, TestVocabCompiler, TestTTS]
     if not args.light:
         test_cases.append(TestG2P)
         test_cases.append(TestMic)