projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new script that uses openocd to reset an LPC target
[fw/altos]
/
ao-tools
/
ao-view
/
aoview_flite.c
diff --git
a/ao-tools/ao-view/aoview_flite.c
b/ao-tools/ao-view/aoview_flite.c
index bc702b0f4cd29275810a574636176378c9ac4a0a..938bcb7755d2b54721fe17ad0313aa286dcb90da 100644
(file)
--- a/
ao-tools/ao-view/aoview_flite.c
+++ b/
ao-tools/ao-view/aoview_flite.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,7
+21,9
@@
#include "aoview.h"
#include <alsa/asoundlib.h>
#include "aoview.h"
#include <alsa/asoundlib.h>
+cst_voice *register_cmu_us_kal16();
cst_voice *register_cmu_us_kal();
cst_voice *register_cmu_us_kal();
+
static cst_voice *voice;
static FILE *pipe_write;
static cst_voice *voice;
static FILE *pipe_write;
@@
-118,7
+121,13
@@
aoview_flite_start(void)
if (!once) {
flite_init();
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();
voice = register_cmu_us_kal();
+#endif
+#endif
if (!voice) {
perror("register voice");
exit(1);
if (!voice) {
perror("register voice");
exit(1);