replace snd_pcm_drain with snd_pcm_drop

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9588 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
henry 2003-03-14 20:36:26 +00:00
parent 6a4fcecaed
commit ff88b3588b
2 changed files with 20 additions and 34 deletions

View File

@ -750,24 +750,17 @@ static void reset()
{
int err;
if (!ao_noblock) {
//drain causes error in nonblock-mode!
if ((err = snd_pcm_drain(alsa_handler)) < 0)
{
printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
return;
}
if ((err = snd_pcm_prepare(alsa_handler)) < 0)
{
printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
return;
}
} else {
if (verbose>0)
printf("alsa-reset: reset nonblocked");
return;
if ((err = snd_pcm_drop(alsa_handler)) < 0)
{
printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err));
return;
}
if ((err = snd_pcm_prepare(alsa_handler)) < 0)
{
printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
return;
}
return;
}
#ifdef USE_POLL

View File

@ -750,24 +750,17 @@ static void reset()
{
int err;
if (!ao_noblock) {
//drain causes error in nonblock-mode!
if ((err = snd_pcm_drain(alsa_handler)) < 0)
{
printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
return;
}
if ((err = snd_pcm_prepare(alsa_handler)) < 0)
{
printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
return;
}
} else {
if (verbose>0)
printf("alsa-reset: reset nonblocked");
return;
if ((err = snd_pcm_drop(alsa_handler)) < 0)
{
printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err));
return;
}
if ((err = snd_pcm_prepare(alsa_handler)) < 0)
{
printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
return;
}
return;
}
#ifdef USE_POLL