From 8c71b2cc05500fc72a6bc8a925f4411f7c52c903 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 24 Sep 2014 16:05:56 +0200 Subject: Move tts_engine_slug to jasper.py, improve module functions of speaker.py --- jasper.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'jasper.py') diff --git a/jasper.py b/jasper.py index 62713ee..1846b8e 100755 --- a/jasper.py +++ b/jasper.py @@ -53,12 +53,19 @@ class Jasper(object): stt_engine_type = "sphinx" logger.warning("stt_engine not specified in profile, defaulting to '%s'", stt_engine_type) + try: + tts_engine_slug = self.config['tts_engine'] + except KeyError: + tts_engine_slug = speak.get_default_engine_slug() + logger.warning("tts_engine not specified in profile, defaulting to '%s'", tts_engine_slug) + tts_engine = speak.get_engine_by_slug(tts_engine_slug) + # Compile dictionary sentences, dictionary, languagemodel = [os.path.abspath(os.path.join(jasperpath.LIB_PATH, filename)) for filename in ("sentences.txt", "dictionary.dic", "languagemodel.lm")] vocabcompiler.compile(sentences, dictionary, languagemodel) # Initialize Mic - self.mic = Mic(speak.newSpeaker(), stt.PocketSphinxSTT(), stt.newSTTEngine(stt_engine_type, api_key=api_key)) + self.mic = Mic(tts_engine(), stt.PocketSphinxSTT(), stt.newSTTEngine(stt_engine_type, api_key=api_key)) def run(self): if 'first_name' in self.config: -- cgit v1.3.1