diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-19 16:54:30 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-26 13:34:47 +0200 |
| commit | 4d9cefe521b6bec2722479c8640a7ed5725f1e84 (patch) | |
| tree | 3a13f70c629955a32242868d84ef2730f6bffb2e /client | |
| parent | aee49f0a5d37e296699c9b8a3aef0cde0c31aa40 (diff) | |
| download | jasper-client-4d9cefe521b6bec2722479c8640a7ed5725f1e84.tar.gz jasper-client-4d9cefe521b6bec2722479c8640a7ed5725f1e84.zip | |
Use distutils.spawn.find_executable instead of which
Diffstat (limited to 'client')
| -rw-r--r-- | client/speaker.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/speaker.py b/client/speaker.py index bcf3702..7b9c018 100644 --- a/client/speaker.py +++ b/client/speaker.py @@ -14,6 +14,7 @@ import sys import tempfile import subprocess from abc import ABCMeta, abstractmethod +from distutils.spawn import find_executable import yaml import pyaudio @@ -78,7 +79,7 @@ class eSpeakSpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (super(eSpeakSpeaker, cls).is_available() and subprocess.call(['which','espeak']) == 0) + return (super(eSpeakSpeaker, cls).is_available() and find_executable('espeak') is not None) def say(self, phrase, voice='default+m3', pitch_adjustment=40, words_per_minute=160): with tempfile.NamedTemporaryFile(suffix='.wav', delete=False) as f: @@ -102,7 +103,7 @@ class saySpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (platform.system() == 'darwin') + return (platform.system() == 'darwin' and find_executable('say') is not None and find_executable('afplay') is not None) def say(self, phrase): cmd = ['say', str(phrase)] @@ -122,7 +123,7 @@ class picoSpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (super(picoSpeaker, cls).is_available() and subprocess.call(['which','pico2wave']) == 0) + return (super(picoSpeaker, cls).is_available() and find_executable('pico2wave') is not None) @property def languages(self): |