summaryrefslogtreecommitdiff
path: root/ao-tools/ao-view
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-23 13:53:25 -0700
committerKeith Packard <keithp@keithp.com>2010-04-23 13:53:25 -0700
commit75d8ffd4eadf31d50b2f58c021530c17ff1bdc66 (patch)
treed0a0f7a7ffd522ac1822ceb613ba21e0d82848a9 /ao-tools/ao-view
parent97f4874d19ec05c81a04a3ecd06abffcf7fbfafc (diff)
Autodetect flite voice registration function
Old versions of flite exported the function 'register_cmu_us_kal' while new ones export 'register_cmu_us_kal16'. This patch just checks which one is available and uses that. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao-tools/ao-view')
-rw-r--r--ao-tools/ao-view/aoview_flite.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ao-tools/ao-view/aoview_flite.c b/ao-tools/ao-view/aoview_flite.c
index 00e6c9de..abcdc491 100644
--- a/ao-tools/ao-view/aoview_flite.c
+++ b/ao-tools/ao-view/aoview_flite.c
@@ -21,6 +21,8 @@
#include <alsa/asoundlib.h>
cst_voice *register_cmu_us_kal16();
+cst_voice *register_cmu_us_kal();
+
static cst_voice *voice;
static FILE *pipe_write;
@@ -118,7 +120,13 @@ aoview_flite_start(void)
if (!once) {
flite_init();
+#if HAVE_REGISTER_CMU_US_KAL16
voice = register_cmu_us_kal16();
+#else
+#if HAVE_REGISTER_CMU_US_KAL
+ voice = register_cmu_us_kal();
+#endif
+#endif
if (!voice) {
perror("register voice");
exit(1);