diff options
| author | wm4 <wm4@nowhere> | 2020-05-27 21:04:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2020-05-27 21:04:32 +0200 |
| commit | 9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb (patch) | |
| tree | 070d1543c670e91e37924469db37948c295e7227 /audio/out/internal.h | |
| parent | 1b03970d79d06b18d0023a87c33fc546c1f988b5 (diff) | |
| download | mpv-9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb.tar.bz2 mpv-9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb.tar.xz | |
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.
Diffstat (limited to 'audio/out/internal.h')
| -rw-r--r-- | audio/out/internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/audio/out/internal.h b/audio/out/internal.h index c036ebad16..71f98304be 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -107,7 +107,6 @@ bool init_buffer_post(struct ao *ao); * resume * Optional: * control - * drain * wait * wakeup * b) ->play must be NULL. ->resume must be provided, and should make the @@ -162,8 +161,6 @@ struct ao_driver { int (*play)(struct ao *ao, void **data, int samples, int flags); // push based: see ao_get_delay() double (*get_delay)(struct ao *ao); - // push based: block until all queued audio is played (optional) - void (*drain)(struct ao *ao); // Optional. Return true if audio has stopped in any way. bool (*get_eof)(struct ao *ao); // Wait until the audio buffer needs to be refilled. The lock is the |