mirror of
https://github.com/mpv-player/mpv
synced 2025-03-03 12:47:49 +00:00
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:
parent
6a4fcecaed
commit
ff88b3588b
@ -750,25 +750,18 @@ static void reset()
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!ao_noblock) {
|
||||
//drain causes error in nonblock-mode!
|
||||
if ((err = snd_pcm_drain(alsa_handler)) < 0)
|
||||
if ((err = snd_pcm_drop(alsa_handler)) < 0)
|
||||
{
|
||||
printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
|
||||
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;
|
||||
}
|
||||
} else {
|
||||
if (verbose>0)
|
||||
printf("alsa-reset: reset nonblocked");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_POLL
|
||||
static int wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count)
|
||||
|
@ -750,25 +750,18 @@ static void reset()
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!ao_noblock) {
|
||||
//drain causes error in nonblock-mode!
|
||||
if ((err = snd_pcm_drain(alsa_handler)) < 0)
|
||||
if ((err = snd_pcm_drop(alsa_handler)) < 0)
|
||||
{
|
||||
printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
|
||||
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;
|
||||
}
|
||||
} else {
|
||||
if (verbose>0)
|
||||
printf("alsa-reset: reset nonblocked");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_POLL
|
||||
static int wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count)
|
||||
|
Loading…
Reference in New Issue
Block a user