From 9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 27 May 2020 21:04:32 +0200 Subject: audio: remove ao_driver.drain The recent change to the common code removed all calls to ->drain. It's currently emulated via a timed sleep and polling ao_eof_reached(). That is actually fallback code for AOs which lacked draining. I could just readd the drain call, but it was a bad idea anyway. My plan to handle this better is to require the AO to signal a underrun, even if AOPLAY_FINAL_CHUNK is not set. Also reinstate not possibly waiting for ao_lavc.c. ao_pcm.c did not have anything to handle this; whatever. --- audio/out/ao_alsa.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'audio/out/ao_alsa.c') diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index b4fa18891b..e100c0fb12 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -944,12 +944,6 @@ static int init(struct ao *ao) return r; } -static void drain(struct ao *ao) -{ - struct priv *p = ao->priv; - snd_pcm_drain(p->alsa); -} - static int get_space(struct ao *ao) { struct priv *p = ao->priv; @@ -1260,7 +1254,6 @@ const struct ao_driver audio_out_alsa = { .pause = audio_pause, .resume = audio_resume, .reset = reset, - .drain = drain, .wait = audio_wait, .wakeup = ao_wakeup_poll, .list_devs = list_devs, -- cgit v1.2.3