Merge branch 'master' of ssh://wwwjail.house/usr/local/git/base/kiosk

diff --git a/kiosk_secrets.py b/kiosk_secrets.py
index 87f06439c7dba3a73e66fd19aa99d12354d6f523..c3d9771c9cc98ce2024a6ace2c551e856717ec88 100644 (file)
--- a/kiosk_secrets.py
+++ b/kiosk_secrets.py
@@ -19,5 +19,5 @@ twitter_consumer_secret = "<you guessed it>"
 twitter_access_token = "<your twitter app access token here>"
 twitter_access_token_secret = "<your twitter app access token secret>"
 
-# pvporcupine access key
-pvporcupine_access_key="<whatever>"
+# wakeword detection
+pvporcupine_key = "<your pvporcupine_key>"

diff --git a/listen.py b/listen.py
index 150145131b1099f56b18bd84e45db088ac387d65..e431a0b199fa67073d315b42e8413187555ef1f1 100755 (executable)
--- a/listen.py
+++ b/listen.py
@@ -9,7 +9,7 @@ import pyaudio
 import speech_recognition as sr
 from pyutils import logging_utils
 
-from kiosk_secrets import pvporcupine_key
+import kiosk_secrets as secrets
 
 logger = logging.getLogger(__name__)
 
@@ -42,9 +42,9 @@ class HotwordListener(object):
         audio_stream = None
         try:
             porcupine = pvporcupine.create(
-                access_key=pvporcupine_key,
                 keyword_paths=self._keyword_paths,
                 sensitivities=self._sensitivities,
+                access_key=secrets.pvporcupine_key,
             )
             recognizer = sr.Recognizer()
             pa = pyaudio.PyAudio()