player: unrangle one aspect of audio EOF handling

For some reason, the buffered_audio variable was used to "cache" the
ao_get_delay() result. But I can't really see any reason why this should
be done, and it just seems to complicate everything.

One reason might be that the value should be checked only if the AO
buffers have been recently filled (as otherwise the delay could go low
and trigger an accidental EOF condition), but this didn't work anyway,
since buffered_audio is set from ao_get_delay() anyway at a later point
if it was unset. And in both cases, the value is used _after_ filling
the audio buffers anyway.

Simplify it. Also, move the audio EOF condition to a separate function.
(Note that ao_eof_reached() probably could/should whether the last
ao_play() call had AOPLAY_FINAL_CHUNK set to avoid accidental EOF on
underflows, but for now let's keep the code equivalent.)

1 files changed, 5 insertions, 0 deletions

diff --git a/audio/out/ao.c b/audio/out/ao.c
index 55fcac1a24..313f4f7554 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -327,6 +327,11 @@ void ao_drain(struct ao *ao)
     }
 }
 
+bool ao_eof_reached(struct ao *ao)
+{
+    return ao_get_delay(ao) < AO_EOF_DELAY;
+}
+
 bool ao_chmap_sel_adjust(struct ao *ao, const struct mp_chmap_sel *s,
                          struct mp_chmap *map)
 {