From be879d206b52221546e4b8e00b60e0c0cf70f855 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 26 Jun 2009 16:12:31 -0500 Subject: [PATCH] alsa update I changed the name of the callback to alsa_callback and removed a line that was making the amount of data written to the sound card very small. --- alsa.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/alsa.c b/alsa.c index c1c51d0..8b967e8 100644 --- a/alsa.c +++ b/alsa.c @@ -51,8 +51,7 @@ int minimum(int x, int y) return y; } -static int alsa_play_callback(short *audio, int numsamples, - espeak_EVENT * events) +static int alsa_callback(short *audio, int numsamples, espeak_EVENT * events) { int samples_written = 0; int avail; @@ -77,7 +76,6 @@ static int alsa_play_callback(short *audio, int numsamples, avail = snd_pcm_avail_update(handle); if (avail <= 0) continue; - avail = minimum(avail, 32 * 2); to_write = minimum(avail, numsamples); samples_written = snd_pcm_writei(handle, audio, to_write); if (samples_written < 0) { @@ -99,7 +97,6 @@ int init_audio(unsigned int rate) { int rc; - /* Open PCM device for playback. */ rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0); if (rc < 0) @@ -153,7 +150,7 @@ int init_audio(unsigned int rate) if (rc < 0) return sound_error(rc, "unable to set hw parameters"); - espeak_SetSynthCallback(alsa_play_callback); + espeak_SetSynthCallback(alsa_callback); return 0; }