Merge pull request #207 from Wolfgange3311999/listener-fixes

Added back session manager behavior from old listener

mycroft/client/speech/listener.py

@@ -119,6 +119,12 @@ class AudioConsumer(threading.Thread):
             self.metrics.increment("mycroft.wakeup")
 
     def process_audio(self, audio):
+        SessionManager.touch()
+        payload = {
+            'utterance': self.mycroft_recognizer.key_phrase,
+            'session': SessionManager.get().session_id,
+        }
+        self.emitter.emit("recognizer_loop:wakeword", payload)
         try:
             self.transcribe([audio])
         except sr.UnknownValueError:  # TODO: Localization

mycroft/client/speech/main.py

@@ -45,6 +45,11 @@ def handle_record_end():
     client.emit(Message('recognizer_loop:record_end'))
 
 
+def handle_wakeword(event):
+    logger.info("Wakeword Detected: " + event['utterance'])
+    client.emit(Message('recognizer_loop:wakeword', event))
+
+
 def handle_utterance(event):
     logger.info("Utterance: " + str(event['utterances']))
     client.emit(Message('recognizer_loop:utterance', event))
@@ -95,6 +100,7 @@ def main():
     loop = RecognizerLoop(device_index=device_index)
     loop.on('recognizer_loop:utterance', handle_utterance)
     loop.on('recognizer_loop:record_begin', handle_record_begin)
+    loop.on('recognizer_loop:wakeword', handle_wakeword)
     loop.on('recognizer_loop:record_end', handle_record_end)
     loop.on('speak', handle_speak)
     client.on('speak', handle_speak)

mycroft/client/speech/mic.py

@@ -137,8 +137,6 @@ class ResponsiveRecognizer(speech_recognition.Recognizer):
 
     def __init__(self, wake_word_recognizer):
         speech_recognition.Recognizer.__init__(self)
-        self.daemon = True
-
         self.wake_word_recognizer = wake_word_recognizer
         self.audio = pyaudio.PyAudio()