Hook aoview directly to alsa

This skips the flite internal audio stuff which opened and closed the audio
device for each phrase. This caused the first part of some phrases to be
missed when using an external audio device.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/aoview/Makefile.am b/aoview/Makefile.am
index c354aa0f033d13197a00560105ae2bc787e9bde5..00851b67a8e81e285a94f90a0ae51e5ceeb08b04 100644 (file)
--- a/aoview/Makefile.am
+++ b/aoview/Makefile.am
@@ -1,9 +1,9 @@
 VERSION=$(shell git describe)
-AM_CFLAGS=$(GNOME_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@
+AM_CFLAGS=$(GNOME_CFLAGS) $(ALSA_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@
 
 bin_PROGRAMS=aoview
 
-aoview_LDADD=$(GNOME_LIBS) $(FLITE_LIBS)
+aoview_LDADD=$(GNOME_LIBS) $(FLITE_LIBS) $(ALSA_LIBS)
 
 aoview_SOURCES = \
        aoview_main.c \

diff --git a/aoview/aoview_flite.c b/aoview/aoview_flite.c
index bca19043083f0cc6078d1699313623617d851c7e..2673824dbdcfaf0780babfd20093fa4a0ca775a6 100644 (file)
--- a/aoview/aoview_flite.c
+++ b/aoview/aoview_flite.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <flite/flite.h>
 #include "aoview.h"
+#include <alsa/asoundlib.h>
 
 cst_voice *register_cmu_us_kal();
 static cst_voice *voice;
@@ -25,14 +26,58 @@ static cst_voice *voice;
 static FILE *pipe_write;
 static GThread *aoview_flite_thread;
 
+static snd_pcm_t       *alsa_handle;
+
 gpointer
 aoview_flite_task(gpointer data)
 {
        FILE            *input = data;
        char            line[1024];
+       cst_wave        *wave;
+       int             rate;
+       int             channels;
+       int             err;
 
-       while (fgets(line, sizeof (line) - 1, input) != NULL)
-               flite_text_to_speech(line, voice, "play");
+       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;
+               }
+       }
+       rate = 0;
+       channels = 0;
+       while (fgets(line, sizeof (line) - 1, input) != NULL) {
+               if (!alsa_handle)
+                       continue;
+               wave = flite_text_to_wave(line, voice);
+               if (wave->sample_rate != rate ||
+                   wave->num_channels != channels)
+               {
+                       rate = wave->sample_rate;
+                       channels = wave->num_channels;
+                       snd_pcm_set_params(alsa_handle,
+                                          SND_PCM_FORMAT_S16,
+                                          SND_PCM_ACCESS_RW_INTERLEAVED,
+                                          channels,
+                                          rate,
+                                          1,
+                                          100000);
+               }
+               snd_pcm_prepare(alsa_handle);
+               err = snd_pcm_writei(alsa_handle,
+                                    wave->samples,
+                                    wave->num_samples);
+               if (err < 0)
+                       fprintf(stderr, "alsa write error %s\n",
+                               strerror(-err));
+               snd_pcm_drain(alsa_handle);
+               delete_wave(wave);
+       }
+       snd_pcm_close(alsa_handle);
+       alsa_handle = 0;
        return NULL;
 }
 

diff --git a/aoview/aoview_voice.c b/aoview/aoview_voice.c
index f7c099b1994d3195f2b61ee595c0b554dbad1d60..24422df6d7025e7f5afd2f36d5402f9f464f5742 100644 (file)
--- a/aoview/aoview_voice.c
+++ b/aoview/aoview_voice.c
@@ -24,6 +24,8 @@ FILE  *aoview_flite;
 
 void aoview_voice_open(void)
 {
+       int     err;
+
        if (!aoview_flite)
                aoview_flite = aoview_flite_start();
 }

diff --git a/configure.ac b/configure.ac
index f55c7ec8502c47054b30e141b540953cc646726d..495e1185a5a5b4d3eff5b3b98f06e044dc50b665 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,8 @@ PKG_CHECK_MODULES([GNOME], [gtk+-2.0 libglade-2.0 gconf-2.0])
 
 PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
+PKG_CHECK_MODULES([ALSA], [alsa])
+
 AC_OUTPUT([
 Makefile
 aoview/Makefile