X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-view%2Faoview_flite.c;h=938bcb7755d2b54721fe17ad0313aa286dcb90da;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=e1b758983d171211d5ee9ade5ec578e7dfa02575;hpb=0c771d999914f9d17c723900f2987acc45fd0fbb;p=fw%2Faltos

diff --git a/ao-tools/ao-view/aoview_flite.c b/ao-tools/ao-view/aoview_flite.c
index e1b75898..938bcb77 100644
--- 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
- * 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
@@ -20,7 +21,9 @@
 #include "aoview.h"
 #include <alsa/asoundlib.h>
 
+cst_voice *register_cmu_us_kal16();
 cst_voice *register_cmu_us_kal();
+
 static cst_voice *voice;
 
 static FILE *pipe_write;
@@ -42,12 +45,10 @@ aoview_flite_task(gpointer data)
 
 	err = snd_pcm_open(&alsa_handle, "default",
 			   SND_PCM_STREAM_PLAYBACK, 0);
-	if (err >= 0)
-	{
-		if (err < 0) {
-			snd_pcm_close(alsa_handle);
-			alsa_handle = 0;
-		}
+	if (err < 0) {
+		fprintf(stderr, "alsa open failed %s\n",
+			strerror(-err));
+		alsa_handle = NULL;
 	}
 	rate = 0;
 	channels = 0;
@@ -120,7 +121,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);