Skip to content

Commit 61494e4

Browse files
authored
Merge pull request Kitt-AI#417 from Kitt-AI/devel
Fixed asound issue on OSX for the Python demo
2 parents 63d69ed + a85434a commit 61494e4

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

examples/Python/snowboydecoder.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,23 @@
1919
DETECT_DING = os.path.join(TOP_DIR, "resources/ding.wav")
2020
DETECT_DONG = os.path.join(TOP_DIR, "resources/dong.wav")
2121

22-
ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
23-
2422
def py_error_handler(filename, line, function, err, fmt):
2523
pass
2624

25+
ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
26+
2727
c_error_handler = ERROR_HANDLER_FUNC(py_error_handler)
2828

2929
@contextmanager
3030
def no_alsa_error():
31-
asound = cdll.LoadLibrary('libasound.so')
32-
asound.snd_lib_error_set_handler(c_error_handler)
33-
yield
34-
asound.snd_lib_error_set_handler(None)
31+
try:
32+
asound = cdll.LoadLibrary('libasound.so')
33+
asound.snd_lib_error_set_handler(c_error_handler)
34+
yield
35+
asound.snd_lib_error_set_handler(None)
36+
except:
37+
yield
38+
pass
3539

3640
class RingBuffer(object):
3741
"""Ring buffer to hold audio from PortAudio"""

examples/Python3/snowboydecoder.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,23 @@
1919
DETECT_DING = os.path.join(TOP_DIR, "resources/ding.wav")
2020
DETECT_DONG = os.path.join(TOP_DIR, "resources/dong.wav")
2121

22-
ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
23-
2422
def py_error_handler(filename, line, function, err, fmt):
2523
pass
2624

25+
ERROR_HANDLER_FUNC = CFUNCTYPE(None, c_char_p, c_int, c_char_p, c_int, c_char_p)
26+
2727
c_error_handler = ERROR_HANDLER_FUNC(py_error_handler)
2828

2929
@contextmanager
3030
def no_alsa_error():
31-
asound = cdll.LoadLibrary('libasound.so')
32-
asound.snd_lib_error_set_handler(c_error_handler)
33-
yield
34-
asound.snd_lib_error_set_handler(None)
31+
try:
32+
asound = cdll.LoadLibrary('libasound.so')
33+
asound.snd_lib_error_set_handler(c_error_handler)
34+
yield
35+
asound.snd_lib_error_set_handler(None)
36+
except:
37+
yield
38+
pass
3539

3640
class RingBuffer(object):
3741
"""Ring buffer to hold audio from PortAudio"""

0 commit comments

Comments
 (0)