diff options
| -rw-r--r-- | libao2/ao_alsa.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index f03ea55441..7c44974f06 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -1037,35 +1037,20 @@ static int get_space(void) /* delay in seconds between first and last sample in buffer */ static float get_delay(void) { - if (alsa_handler) { - - snd_pcm_status_t *status; - float ret; - - snd_pcm_status_alloca(&status); + snd_pcm_sframes_t delay; - if ((ret = snd_pcm_status(alsa_handler, status)) < 0) - { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-delay: cannot get pcm status: %s\n", snd_strerror(ret)); - } + if (snd_pcm_delay(alsa_handler, &delay) < 0) + return 0; - switch(snd_pcm_status_get_state(status)) - { - case SND_PCM_STATE_OPEN: - case SND_PCM_STATE_PREPARED: - case SND_PCM_STATE_RUNNING: - ret = (float)snd_pcm_status_get_delay(status)/(float)ao_data.samplerate; - break; - default: - ret = 0; + if (delay < 0) { + /* underrun - move the application pointer forward to catch up */ +#if SND_LIB_VERSION >= 0x000901 /* snd_pcm_forward() exists since 0.9.0rc8 */ + snd_pcm_forward(alsa_handler, -delay); +#endif + delay = 0; } - - - if (ret < 0) - ret = 0; - return(ret); - + return (float)delay / (float)ao_data.samplerate; } else { return(0); } |