ceos/espeakup
1
0
Fork 0
mirror of https://github.com/linux-speakup/espeakup.git synced 2026-08-09 09:19:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

removed the minimum function

Browse source 
This function really wasn't needed.  I also attempted to make the
callback functionn more like the test code in the alsa library git
repository.
This commit is contained in:
William Hubbs 2009-10-01 14:15:43 -05:00
commit ffe397fb91
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
alsa.c
View file

@ -57,20 +57,10 @@ static int sound_error(int err, const char *msg)
return err;
}
static int minimum(int x, int y)
{
if (x <= y)
return x;
else
return y;
}
static int alsa_callback(short *audio, int numsamples,
espeak_EVENT * events)
{
int samples_written = 0;
int avail;
int to_write;
int written = 0;
int rc = 0;
lock_audio_mutex();
@ -80,20 +70,17 @@ static int alsa_callback(short *audio, int numsamples,
}
while (numsamples > 0 && (!stop_requested && should_run)) {
avail = snd_pcm_avail_update(handle);
if (avail <= 0) {
if (avail < 0)
snd_pcm_prepare(handle);
continue;
}
to_write = minimum(avail, numsamples);
samples_written = snd_pcm_writei(handle, audio, to_write);
if (samples_written < 0) {
snd_pcm_prepare(handle);
} else {
numsamples -= samples_written;
audio += samples_written;
written = snd_pcm_writei(handle, audio, numsamples);
if (written < 0)
written = snd_pcm_recover(handle, written, 0);
if (written < 0) {
fprintf(stderr, "snd_pcm_writei failed: %s\n", snd_strerror(written));
break;
}
if (written > 0 && written < numsamples)
printf("Short write (expected %i, wrote %i)\n", numsamples, written);
numsamples -= written;
audio += written;
}
rc = (stop_requested || !should_run);
unlock_audio_mutex();