Merge branch 'devel' of https://github.com/Kitt-AI/snowboy into devel

robertocaiwu · Apr 6, 2018 · ebcba35 · ebcba35
2 parents 38509e9 + 196ce94
commit ebcba35
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/examples/Python/snowboydecoder.py b/examples/Python/snowboydecoder.py
@@ -7,6 +7,8 @@
 import wave
 import os
 import logging
+from ctypes import *
+from contextlib import contextmanager
 
 logging.basicConfig()
 logger = logging.getLogger("snowboy")
@@ -17,6 +19,19 @@
 DETECT_DING = os.path.join(TOP_DIR, "resources/ding.wav")
 DETECT_DONG = os.path.join(TOP_DIR, "resources/dong.wav")
 
+ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
+
+def py_error_handler(filename, line, function, err, fmt):
+    pass
+
+c_error_handler = ERROR_HANDLER_FUNC(py_error_handler)
+
+@contextmanager
+def no_alsa_error():
+    asound = cdll.LoadLibrary('libasound.so')
+    asound.snd_lib_error_set_handler(c_error_handler)
+    yield
+    asound.snd_lib_error_set_handler(None)
 
 class RingBuffer(object):
     """Ring buffer to hold audio from PortAudio"""
@@ -43,7 +58,8 @@ def play_audio_file(fname=DETECT_DING):
     """
     ding_wav = wave.open(fname, 'rb')
     ding_data = ding_wav.readframes(ding_wav.getnframes())
-    audio = pyaudio.PyAudio()
+    with no_alsa_error():
+        audio = pyaudio.PyAudio()
     stream_out = audio.open(
         format=audio.get_format_from_width(ding_wav.getsampwidth()),
         channels=ding_wav.getnchannels(),
@@ -104,7 +120,8 @@ def audio_callback(in_data, frame_count, time_info, status):
 
         self.ring_buffer = RingBuffer(
             self.detector.NumChannels() * self.detector.SampleRate() * 5)
-        self.audio = pyaudio.PyAudio()
+        with no_alsa_error():
+            self.audio = pyaudio.PyAudio()
         self.stream_in = self.audio.open(
             input=True, output=False,
             format=self.audio.get_format_from_width(

diff --git a/examples/Python3/snowboydecoder.py b/examples/Python3/snowboydecoder.py
@@ -7,6 +7,8 @@
 import wave
 import os
 import logging
+from ctypes import *
+from contextlib import contextmanager
 
 logging.basicConfig()
 logger = logging.getLogger("snowboy")
@@ -17,6 +19,19 @@
 DETECT_DING = os.path.join(TOP_DIR, "resources/ding.wav")
 DETECT_DONG = os.path.join(TOP_DIR, "resources/dong.wav")
 
+ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
+
+def py_error_handler(filename, line, function, err, fmt):
+    pass
+
+c_error_handler = ERROR_HANDLER_FUNC(py_error_handler)
+
+@contextmanager
+def no_alsa_error():
+    asound = cdll.LoadLibrary('libasound.so')
+    asound.snd_lib_error_set_handler(c_error_handler)
+    yield
+    asound.snd_lib_error_set_handler(None)
 
 class RingBuffer(object):
     """Ring buffer to hold audio from PortAudio"""
@@ -44,7 +59,8 @@ def play_audio_file(fname=DETECT_DING):
     """
     ding_wav = wave.open(fname, 'rb')
     ding_data = ding_wav.readframes(ding_wav.getnframes())
-    audio = pyaudio.PyAudio()
+    with no_alsa_error():
+        audio = pyaudio.PyAudio()
     stream_out = audio.open(
         format=audio.get_format_from_width(ding_wav.getsampwidth()),
         channels=ding_wav.getnchannels(),
@@ -141,7 +157,8 @@ def audio_callback(in_data, frame_count, time_info, status):
             play_data = chr(0) * len(in_data)
             return play_data, pyaudio.paContinue
 
-        self.audio = pyaudio.PyAudio()
+        with no_alsa_error():
+            self.audio = pyaudio.PyAudio()
         self.stream_in = self.audio.open(
             input=True, output=False,
             format=self.audio.get_format_from_width(